diff --git a/package/tsa/courier-imap/courier-imap.conf b/package/tsa/courier-imap/courier-imap.conf index c1e037167..a3510ed1d 100644 --- a/package/tsa/courier-imap/courier-imap.conf +++ b/package/tsa/courier-imap/courier-imap.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/tsa/courier-imap/courier-imap.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/tsa/courier-imap/courier-imap.desc b/package/tsa/courier-imap/courier-imap.desc index 0552a4bd7..0e1a87269 100644 --- a/package/tsa/courier-imap/courier-imap.desc +++ b/package/tsa/courier-imap/courier-imap.desc @@ -6,7 +6,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/tsa/courier-imap/courier-imap.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by @@ -35,6 +35,6 @@ [C] extra/server [L] GPL [S] Stable -[V] 2.2.1 +[V] 3.0.4 [P] X -----5---9 669.000 -[D] 1181133243 courier-imap-2.2.1.tar.bz2 http://dl.sourceforge.net/sourceforge/courier/ +[D] 367681901 courier-imap-3.0.4.tar.bz2 http://aleron.dl.sourceforge.net/sourceforge/courier/ diff --git a/package/tsa/courier-imap/maildirmake.patch b/package/tsa/courier-imap/maildirmake.patch index bf1d87f92..2ad8ae9fd 100644 --- a/package/tsa/courier-imap/maildirmake.patch +++ b/package/tsa/courier-imap/maildirmake.patch @@ -6,59 +6,96 @@ # 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 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# 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 -Nur courier-imap-2.1.2.orig/Makefile.am courier-imap-2.1.2/Makefile.am ---- courier-imap-2.1.2.orig/Makefile.am 2003-08-09 23:11:01.000000000 +0200 -+++ courier-imap-2.1.2/Makefile.am 2003-09-30 17:39:05.000000000 +0200 -@@ -16,7 +16,7 @@ +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 +@@ -21,7 +21,7 @@ databindir=$(datadir) databin_SCRIPTS=mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb --binPROGRAMS=imapd pop3d maildirmake deliverquota maildirkw -+binPROGRAMS=imapd pop3d deliverquota maildirkw - sbinPROGRAMS=imaplogin pop3login userdbpw - libexecPROGRAMS=makedatprog couriertcpd courierlogger +-binPROGRAMS=imapd pop3d maildirmake maildiracl deliverquota maildirkw ++binPROGRAMS=imapd pop3d maildiracl deliverquota maildirkw + sbinPROGRAMS=authenumerate imaplogin pop3login userdbpw courierlogger + libexecPROGRAMS=makedatprog couriertcpd -@@ -26,7 +26,7 @@ +@@ -31,7 +31,7 @@ EXTRA_PROGRAMS= --man_MANS=makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 -+man_MANS=makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 deliverquota.8 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 - EXTRA_DIST=00README.NOW.OR.SUFFER README README.cygwin automake.fix COPYING.GPL +-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 + EXTRA_DIST=00README.NOW.OR.SUFFER README README.cygwin automake.fix \ + COPYING.GPL NEWS.html $(TEMPLFILES) + +@@ -93,9 +93,6 @@ + vchkpw2userdb: userdb/vchkpw2userdb + cp userdb/vchkpw2userdb vchkpw2userdb + +-maildirmake$(EXEEXT): maildir/maildirmake$(EXEEXT) +- cp maildir/maildirmake$(EXEEXT) . +- + maildiracl$(EXEEXT): maildir/maildiracl$(EXEEXT) + cp maildir/maildiracl$(EXEEXT) . + +@@ -132,9 +129,6 @@ + deliverquota.8: maildir/deliverquota.8 + cp maildir/deliverquota.8 . + +-maildirmake.1: maildir/maildirmake.1 +- cp maildir/maildirmake.1 . +- + maildiracl.1: maildir/maildiracl.1 + cp maildir/maildiracl.1 . - sysconf_DATA=imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \ -diff -Nur courier-imap-2.1.2.orig/Makefile.in courier-imap-2.1.2/Makefile.in ---- courier-imap-2.1.2.orig/Makefile.in 2003-09-07 22:48:10.000000000 +0200 -+++ courier-imap-2.1.2/Makefile.in 2003-09-30 17:40:09.000000000 +0200 -@@ -110,7 +110,7 @@ +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 @@ databindir = $(datadir) databin_SCRIPTS = mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb --binPROGRAMS = imapd pop3d maildirmake deliverquota maildirkw -+binPROGRAMS = imapd pop3d deliverquota maildirkw - sbinPROGRAMS = imaplogin pop3login userdbpw - libexecPROGRAMS = makedatprog couriertcpd courierlogger +-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw ++binPROGRAMS = imapd pop3d maildiracl deliverquota maildirkw + sbinPROGRAMS = authenumerate imaplogin pop3login userdbpw courierlogger + libexecPROGRAMS = makedatprog couriertcpd -@@ -120,7 +120,7 @@ +@@ -154,7 +154,7 @@ EXTRA_PROGRAMS = --man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 -+man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 deliverquota.8 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 +-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.89 2004/04/24 04:15:23 mrsam Exp $ +@@ -931,9 +931,6 @@ + vchkpw2userdb: userdb/vchkpw2userdb + cp userdb/vchkpw2userdb vchkpw2userdb + +-maildirmake$(EXEEXT): maildir/maildirmake$(EXEEXT) +- cp maildir/maildirmake$(EXEEXT) . +- + maildiracl$(EXEEXT): maildir/maildiracl$(EXEEXT) + cp maildir/maildiracl$(EXEEXT) . + +@@ -970,9 +967,6 @@ + deliverquota.8: maildir/deliverquota.8 + cp maildir/deliverquota.8 . +-maildirmake.1: maildir/maildirmake.1 +- cp maildir/maildirmake.1 . +- + maildiracl.1: maildir/maildiracl.1 + cp maildir/maildiracl.1 . - # Added by sysconftoolize: $Id: Makefile.am,v 1.79 2003/08/09 21:11:01 mrsam Exp $