Version bump.

5 files changed, 197 insertions, 3 deletions

diff --git a/net-mail/bincimap/ChangeLog b/net-mail/bincimap/ChangeLog
index a4dfaea90500..820d7e0fc0fe 100644
--- a/net-mail/bincimap/ChangeLog
+++ b/net-mail/bincimap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/bincimap
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.5 2004/01/08 23:13:19 nakano Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.6 2004/01/18 15:58:45 nakano Exp $
+
+*bincimap-1.2.5 (18 Jan 2004)
+
+  18 Jan 2004; Masatomo Nakano <nakano@gentoo.org> bincimap-1.2.5.ebuild,
+  files/bincimap-1.2.5-gentoo.diff:
+  Version bump.
 
 *bincimap-1.2.4 (08 Jan 2004)
 
diff --git a/net-mail/bincimap/Manifest b/net-mail/bincimap/Manifest
index 707733510943..8f466a17cdc4 100644
--- a/net-mail/bincimap/Manifest
+++ b/net-mail/bincimap/Manifest
@@ -1,10 +1,13 @@
 MD5 38f7e7e07cecf943cd078f4aef09fef1 metadata.xml 250
 MD5 711d2bf587faf0c7c0ea597e9acf7faa bincimap-1.2.3.ebuild 2022
-MD5 506cca471e23d37802e38187eaba9965 ChangeLog 887
+MD5 1fbf8e5bd1c3ff40a73750b79ecaa5af ChangeLog 1045
 MD5 8275ab0a32bbb173e66f574eefb7baf8 bincimap-1.2.3-r1.ebuild 2044
 MD5 64a835495a6548229c5b32428225c934 bincimap-1.2.4.ebuild 2042
+MD5 d2ed90a56721f775eafab81945828752 bincimap-1.2.5.ebuild 2042
 MD5 7faa38e06bc7ca25b09ea04fedf1e941 files/digest-bincimap-1.2.3 67
 MD5 0292f9ed05ad50bdbdd139e6b62036cd files/bincimap-1.2.3-gentoo.diff 6482
 MD5 7faa38e06bc7ca25b09ea04fedf1e941 files/digest-bincimap-1.2.3-r1 67
 MD5 bce06a9742d69a3195c6b710eff6074c files/digest-bincimap-1.2.4 67
 MD5 0292f9ed05ad50bdbdd139e6b62036cd files/bincimap-1.2.4-gentoo.diff 6482
+MD5 1a383023446536b96c18b67730cc1750 files/digest-bincimap-1.2.5 67
+MD5 0292f9ed05ad50bdbdd139e6b62036cd files/bincimap-1.2.5-gentoo.diff 6482
diff --git a/net-mail/bincimap/bincimap-1.2.5.ebuild b/net-mail/bincimap/bincimap-1.2.5.ebuild
new file mode 100644
index 000000000000..6e7900c624c3
--- /dev/null
+++ b/net-mail/bincimap/bincimap-1.2.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.5.ebuild,v 1.1 2004/01/18 15:58:45 nakano Exp $
+
+DESCRIPTION="IMAP server for Maildir"
+SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}.tar.bz2"
+HOMEPAGE="http://www.bincimap.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ssl"
+
+DEPEND="virtual/glibc
+	ssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}
+	sys-apps/daemontools
+	sys-apps/ucspi-tcp
+	net-mail/checkpassword"
+
+S="${WORKDIR}/${P}"
+
+src_compile() {
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	econf `use_enable ssl ssl` --sysconfdir=/etc/bincimap || die
+	emake || die
+}
+
+src_install () {
+	einstall sysconfdir=${D}/etc/bincimap || die
+	keepdir /var/log/bincimap || die
+	if [ `use ssl` ]; then
+		keepdir /var/log/bincimap-ssl || die
+	fi
+
+	dodoc AUTHORS COPYING COPYING.OpenSSL ChangeLog INSTALL \
+		NEWS README TODO
+
+	cd doc
+	dodoc *.html
+	dodoc manual/bincimap-manual.dvi manual/bincimap-manual.ps
+}
+
+pkg_postinst() {
+	if [ `use ssl` ]; then
+		einfo "This command will setup bincimap-ssl on your system."
+		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	fi
+
+	einfo "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
+	einfo "and create the following links :"
+	einfo "ln -s /etc/bincimap/service/imap /service/imap"
+
+	einfo "If you use ssl, "
+	einfo "ln -s /etc/bincimap/service/imaps /service/imaps"
+}
+
+pkg_config() {
+	if [ `use ssl` ]; then
+		local pemfile=/etc/bincimap/bincimap.pem
+		if [ ! -f $pemfile ]; then
+			echo "Creating a self-signed ssl-cert:"
+			/usr/bin/openssl req -new -x509 -nodes -out $pemfile -days 366 -keyout $pemfile
+			chmod 640 $pemfile
+
+			einfo "If You want to have a signed cert, do the following:"
+			einfo "openssl req -new -nodes -out req.pem \\"
+			einfo "-keyout $pemfile"
+			einfo "chmod 640 $pemfile"
+			einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
+			einfo "cat signed_req.pem >> $pemfile"
+		fi
+	fi
+}
diff --git a/net-mail/bincimap/files/bincimap-1.2.5-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.5-gentoo.diff
new file mode 100644
index 000000000000..aa0d316b9513
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.2.5-gentoo.diff
@@ -0,0 +1,110 @@
+diff -Naru bincimap-1.2.3.org/Makefile.in bincimap-1.2.3/Makefile.in
+--- bincimap-1.2.3.org/Makefile.in	2003-10-09 07:56:04.000000000 +0900
++++ bincimap-1.2.3/Makefile.in	2003-10-09 07:56:28.000000000 +0900
+@@ -131,7 +131,7 @@
+ target_alias = @target_alias@
+ 
+ #--------------------------------------------------------------------------
+-SUBDIRS = conf contrib doc man service src tests
++SUBDIRS = conf contrib man service src tests
+ 
+ #--------------------------------------------------------------------------
+ EXTRA_DIST = bincimap.spec config.h COPYING.OpenSSL config.h.in
+diff -Naru bincimap-1.2.3.org/conf/bincimap.conf.in bincimap-1.2.3/conf/bincimap.conf.in
+--- bincimap-1.2.3.org/conf/bincimap.conf.in	2003-10-09 07:56:04.000000000 +0900
++++ bincimap-1.2.3/conf/bincimap.conf.in	2003-10-09 08:06:34.000000000 +0900
+@@ -56,7 +56,7 @@
+     type = "Maildir",                              /* only Maildir
+ 						    * support */
+ 
+-    path = "Maildir",                              /* default path */
++    path = ".maildir",                              /* default path */
+ 
+     auto create inbox = "yes",                     /* create INBOX in
+ 						    * given format if
+diff -Naru bincimap-1.2.3.org/service/Makefile.in bincimap-1.2.3/service/Makefile.in
+--- bincimap-1.2.3.org/service/Makefile.in	2003-10-09 07:56:04.000000000 +0900
++++ bincimap-1.2.3/service/Makefile.in	2003-10-09 07:56:28.000000000 +0900
+@@ -425,10 +425,10 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imap
+ 
+ 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imap/run ]; then $(INSTALL_DATA) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/run;  else $(INSTALL_DATA) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/run.new; echo "- New service/imap/run file saved as $(DESTDIR)$(sysconfdir)/service/imap/run.new" >> $(srcdir)/../install.log; fi;
+-	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/down
++#	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/down
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imaps
+ 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imaps/run ]; then $(INSTALL_DATA) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/run;  else $(INSTALL_DATA) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/run.new; echo "- New service/imaps/run file saved as $(DESTDIR)$(sysconfdir)/service/imaps/run.new" >> $(srcdir)/../install.log; fi;
+-	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/down
++#	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/down
+ 
+ #--------------------------------------------------------------------------
+ uninstall-hook:
+diff -Naru bincimap-1.2.3.org/service/log/Makefile.in bincimap-1.2.3/service/log/Makefile.in
+--- bincimap-1.2.3.org/service/log/Makefile.in	2003-10-09 07:56:04.000000000 +0900
++++ bincimap-1.2.3/service/log/Makefile.in	2003-10-09 07:56:28.000000000 +0900
+@@ -281,12 +281,12 @@
+ install-exec-hook:
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imap/log
+ 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imap/log/run ]; then $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/log/run;  else $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/log/run.new; echo "- New service/imap/run file saved as $(DESTDIR)$(sysconfdir)/service/imap/log/run.new" >> $(srcdir)/../../install.log; fi
+-	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/log/down
++#	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/log/down
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imaps/log
+ 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imaps/log/run ]; then $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/log/run;  else $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/log/run.new; echo "- New service/imaps/run file saved as $(DESTDIR)$(sysconfdir)/service/imaps/log/run.new" >> $(srcdir)/../../install.log; fi;
+-	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/log/down
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap-ssl
++#	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/log/down
++#	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap
++#	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap-ssl
+ 
+ #--------------------------------------------------------------------------
+ uninstall-hook:
+diff -Naru bincimap-1.2.3.org/service/log/run-ssl.in bincimap-1.2.3/service/log/run-ssl.in
+--- bincimap-1.2.3.org/service/log/run-ssl.in	2003-10-09 07:56:04.000000000 +0900
++++ bincimap-1.2.3/service/log/run-ssl.in	2003-10-09 07:56:28.000000000 +0900
+@@ -14,5 +14,5 @@
+ 
+ exec 2>&1
+ 
+-exec multilog t n5 s1048576 @localstatedir@/log/bincimap-ssl
++exec multilog t n5 s1048576 /var/log/bincimap-ssl
+ 
+diff -Naru bincimap-1.2.3.org/service/log/run.in bincimap-1.2.3/service/log/run.in
+--- bincimap-1.2.3.org/service/log/run.in	2003-10-09 07:56:04.000000000 +0900
++++ bincimap-1.2.3/service/log/run.in	2003-10-09 07:56:28.000000000 +0900
+@@ -14,5 +14,5 @@
+ 
+ exec 2>&1
+ 
+-exec multilog t n5 s1048576 @localstatedir@/log/bincimap
++exec multilog t n5 s1048576 /var/log/bincimap
+ 
+diff -Naru bincimap-1.2.3.org/service/run-ssl.in bincimap-1.2.3/service/run-ssl.in
+--- bincimap-1.2.3.org/service/run-ssl.in	2003-10-09 07:56:04.000000000 +0900
++++ bincimap-1.2.3/service/run-ssl.in	2003-10-09 07:56:28.000000000 +0900
+@@ -7,8 +7,8 @@
+ exec	tcpserver -c 100 -u 0 -g 0			\
+     -l $(hostname) -HDRP				\
+     0 993						\
+-    @prefix@/bin/bincimap-up				\
++    /usr/bin/bincimap-up				\
+     --logtype=multilog					\
+     --conf=@sysconfdir@/bincimap.conf --ssl --     	\
+     /bin/checkpassword					\
+-    @prefix@/bin/bincimapd
++    /usr/bin/bincimapd
+diff -Naru bincimap-1.2.3.org/service/run.in bincimap-1.2.3/service/run.in
+--- bincimap-1.2.3.org/service/run.in	2003-10-09 07:56:04.000000000 +0900
++++ bincimap-1.2.3/service/run.in	2003-10-09 07:56:28.000000000 +0900
+@@ -7,10 +7,10 @@
+ exec	tcpserver -c 100 -u 0 -g 0		\
+     -l $(hostname) -HDRP			\
+     0 143					\
+-    @prefix@/bin/bincimap-up			\
++    /usr/bin/bincimap-up			\
+     --logtype=multilog				\
+     --conf=@sysconfdir@/bincimap.conf --	\
+     /bin/checkpassword				\
+-    @prefix@/bin/bincimapd
++    /usr/bin/bincimapd
+ 
+ 
diff --git a/net-mail/bincimap/files/digest-bincimap-1.2.5 b/net-mail/bincimap/files/digest-bincimap-1.2.5
new file mode 100644
index 000000000000..f61bbc719696
--- /dev/null
+++ b/net-mail/bincimap/files/digest-bincimap-1.2.5
@@ -0,0 +1 @@
+MD5 2551aaa51a37cad6b1b83562c98215f7 bincimap-1.2.5.tar.bz2 414705