Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 May 2017 13:56:06 +0200
From:      "Herbert J. Skuhra" <herbert@mailbox.org>
To:        ports@freebsd.org
Cc:        Per olof Ljungmark <peo@intersonic.se>, ume@FreeBSD.org
Subject:   Re: cyrus-imapd24-2.4.19_1 is marked as broken: Patch is not applicable.
Message-ID:  <87vaom8qeh.wl-herbert@mailbox.org>
In-Reply-To: <c253711e-f52c-033a-ab1c-3ae4fe7a35a3@intersonic.se>
References:  <c253711e-f52c-033a-ab1c-3ae4fe7a35a3@intersonic.se>

next in thread | previous in thread | raw e-mail | index | archive | help
Per olof Ljungmark skrev:
> 
> Is a fix for this coming?
> Thanks,

Why are you still using 2.4.x?

The AUTOCREATE patch was obviously created for 2.3.x in 2010 and later
updated by mm@ for 2.4. It seems there is only a tiny change required:

- Modify cyrus-imapd-2.4.4-autocreate-0.10-0.patch in /usr/ports/distfiles:

--- cyrus-imapd-2.4.4-autocreate-0.10-0.patch.bak       2017-05-27 13:32:07.313215000 +0200                                        
+++ cyrus-imapd-2.4.4-autocreate-0.10-0.patch   2017-05-27 13:38:55.245649000 +0200                                                
@@ -249,11 +249,11 @@                                                                                                              
  mupdate_err.h: mupdate_err.c                                                                                                     
                                                                                                                                   
  ### Services                                                                                                                     
--idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)                                                                                 
-+idled: idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)                                                                   
+-idled: idled.o idlemsg.o mutex_fake.o libimap.a $(DEPLIBS)                                                                       
++idled: idled.o idlemsg.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)                                                         
        $(CC) $(LDFLAGS) -o idled \                                                                                                
--       idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)                                                                         
-+       idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)                                                           
+-       idled.o idlemsg.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)                                                               
++       idled.o idlemsg.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)                                                 
                                                                                                                                   
  lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \                                                                  
         libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)

- Patch the port:

Index: mail/cyrus-imapd24/Makefile                                                                                                 
===================================================================                                                                
--- mail/cyrus-imapd24/Makefile (revision 441838)                                                                                  
+++ mail/cyrus-imapd24/Makefile (working copy)                                                                                     
@@ -103,7 +103,7 @@                                                                                                                
 AUTOCREATE_VERSION=    0.10-0                                                                                                     
 AUTOCREATE_PATCH_SITES=        LOCAL/mm:autocreate                                                                                
 AUTOCREATE_PATCHFILES= ${PORTNAME}-2.4.4-autocreate-${AUTOCREATE_VERSION}.patch:-p1:autocreate                                    
-AUTOCREATE_BROKEN=     Patch is not applicable                                                                                    
+#AUTOCREATE_BROKEN=    Patch is not applicable                                                                                    
                                                                                                                                   
 AUTOSIEVE_VERSION=     0.6.0                                                                                                      
 AUTOSIEVE_PATCH_SITES= LOCAL/mm:autosieve                                                                                         
Index: mail/cyrus-imapd24/distinfo                                                                                                 
===================================================================                                                                
--- mail/cyrus-imapd24/distinfo (revision 441838)                                                                                  
+++ mail/cyrus-imapd24/distinfo (working copy)                                                                                     
@@ -1,7 +1,7 @@                                                                                                                    
 TIMESTAMP = 1494954318                                                                                                            
 SHA256 (cyrus-imapd-2.4.19.tar.gz) = 5ef3cef8e394901fba162f14eb43f5e364b266234eff28d17273303c019f8ef1                             
 SIZE (cyrus-imapd-2.4.19.tar.gz) = 2488567                                                                                        
-SHA256 (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 1130e80b6604901ba8cf887c792fa8e4ef181b4cfc212720bcfc984163fe8a13             
-SIZE (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 74039                                                                          
+SHA256 (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = a42015ac045a8cae6e6aff51728731e14154bf3932acb04875143970ff379263             
+SIZE (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 74079                                                                          
 SHA256 (cyrus-imapd-2.4.12-autosieve-0.6.0.patch) = daafab6c1a824d1d16745ea25a0bb6e404655ef690961e1dc236805e5c923135              
 SIZE (cyrus-imapd-2.4.12-autosieve-0.6.0.patch) = 7626

Untested as I am not using Cyrus-imapd.

--
Herbert



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87vaom8qeh.wl-herbert>