From 2e2b0af8a25efc01c5c60fa9eac61066ecf4f354 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Wed, 27 Oct 2004 03:25:46 +0000 Subject: [PATCH] Andreas V. Meier: update courier-imap (3.0.8) courier-imap: adopt maildirmake.patch (whyever it exists) [2004101501011521215] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4588 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/tsa/courier-imap/courier-imap.desc | 4 +- package/tsa/courier-imap/maildirmake.patch | 50 ++++++---------------- 2 files changed, 15 insertions(+), 39 deletions(-) diff --git a/package/tsa/courier-imap/courier-imap.desc b/package/tsa/courier-imap/courier-imap.desc index 58c23ecc3..cdb2e4d89 100644 --- a/package/tsa/courier-imap/courier-imap.desc +++ b/package/tsa/courier-imap/courier-imap.desc @@ -35,7 +35,7 @@ [C] extra/server [L] GPL [S] Stable -[V] 3.0.5 +[V] 3.0.8 [P] X -?---5---9 173.700 -[D] 1095531018 courier-imap-3.0.5.tar.bz2 http://dl.sourceforge.net/sourceforge/courier/ +[D] 2350104266 courier-imap-3.0.8.tar.bz2 http://dl.sourceforge.net/sourceforge/courier/ diff --git a/package/tsa/courier-imap/maildirmake.patch b/package/tsa/courier-imap/maildirmake.patch index 2ad8ae9fd..449e30a1b 100644 --- a/package/tsa/courier-imap/maildirmake.patch +++ b/package/tsa/courier-imap/maildirmake.patch @@ -1,25 +1,6 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/courier-imap/maildirmake.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -urN courier-imap-3.0.4.orig/Makefile.am courier-imap-3.0.4/Makefile.am ---- courier-imap-3.0.4.orig/Makefile.am 2004-04-24 00:15:23.000000000 -0400 -+++ courier-imap-3.0.4/Makefile.am 2004-05-26 23:50:59.000000000 -0400 +diff -ruN courier-imap-3.0.8/Makefile.am courier-imap-3.0.8-new/Makefile.am +--- courier-imap-3.0.8/Makefile.am 2004-08-29 21:03:28.000000000 +0200 ++++ courier-imap-3.0.8-new/Makefile.am 2004-10-13 21:41:38.837692912 +0200 @@ -21,7 +21,7 @@ databindir=$(datadir) databin_SCRIPTS=mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb @@ -38,7 +19,7 @@ diff -urN courier-imap-3.0.4.orig/Makefile.am courier-imap-3.0.4/Makefile.am EXTRA_DIST=00README.NOW.OR.SUFFER README README.cygwin automake.fix \ COPYING.GPL NEWS.html $(TEMPLFILES) -@@ -93,9 +93,6 @@ +@@ -89,9 +89,6 @@ vchkpw2userdb: userdb/vchkpw2userdb cp userdb/vchkpw2userdb vchkpw2userdb @@ -48,7 +29,7 @@ diff -urN courier-imap-3.0.4.orig/Makefile.am courier-imap-3.0.4/Makefile.am maildiracl$(EXEEXT): maildir/maildiracl$(EXEEXT) cp maildir/maildiracl$(EXEEXT) . -@@ -132,9 +129,6 @@ +@@ -128,9 +125,6 @@ deliverquota.8: maildir/deliverquota.8 cp maildir/deliverquota.8 . @@ -58,28 +39,23 @@ diff -urN courier-imap-3.0.4.orig/Makefile.am courier-imap-3.0.4/Makefile.am maildiracl.1: maildir/maildiracl.1 cp maildir/maildiracl.1 . -diff -urN courier-imap-3.0.4.orig/Makefile.in courier-imap-3.0.4/Makefile.in ---- courier-imap-3.0.4.orig/Makefile.in 2004-05-15 22:34:21.000000000 -0400 -+++ courier-imap-3.0.4/Makefile.in 2004-05-26 23:51:34.000000000 -0400 -@@ -144,7 +144,7 @@ +diff -ruN courier-imap-3.0.8/Makefile.in courier-imap-3.0.8-new/Makefile.in +--- courier-imap-3.0.8/Makefile.in 2004-09-18 20:49:13.000000000 +0200 ++++ courier-imap-3.0.8-new/Makefile.in 2004-10-13 21:42:16.521964032 +0200 +@@ -203,10 +203,10 @@ + CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS) databindir = $(datadir) databin_SCRIPTS = mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb - -binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw +binPROGRAMS = imapd pop3d maildiracl deliverquota maildirkw sbinPROGRAMS = authenumerate imaplogin pop3login userdbpw courierlogger libexecPROGRAMS = makedatprog couriertcpd - -@@ -154,7 +154,7 @@ - - EXTRA_PROGRAMS = - -man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 courierlogger.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 +man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 courierlogger.1 deliverquota.8 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 + # Added by sysconftoolize: $Id: Makefile.am,v 1.96 2004/08/29 19:03:28 mrsam Exp $ - # Added by sysconftoolize: $Id: Makefile.am,v 1.89 2004/04/24 04:15:23 mrsam Exp $ -@@ -931,9 +931,6 @@ +@@ -948,9 +948,6 @@ vchkpw2userdb: userdb/vchkpw2userdb cp userdb/vchkpw2userdb vchkpw2userdb @@ -89,7 +65,7 @@ diff -urN courier-imap-3.0.4.orig/Makefile.in courier-imap-3.0.4/Makefile.in maildiracl$(EXEEXT): maildir/maildiracl$(EXEEXT) cp maildir/maildiracl$(EXEEXT) . -@@ -970,9 +967,6 @@ +@@ -987,9 +984,6 @@ deliverquota.8: maildir/deliverquota.8 cp maildir/deliverquota.8 .