version bump

5 files changed, 232 insertions, 1 deletions

diff --git a/net-mail/bincimap/ChangeLog b/net-mail/bincimap/ChangeLog
index f0a4447d1cb6..59245998c9b1 100644
--- a/net-mail/bincimap/ChangeLog
+++ b/net-mail/bincimap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/bincimap
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.28 2004/11/16 11:48:35 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.29 2004/11/29 01:53:24 nakano Exp $
+
+*bincimap-1.3.3 (29 Nov 2004)
+
+  29 Nov 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/bincimap-1.3.3-gentoo.diff, +bincimap-1.3.3.ebuild:
+  Version bump.
 
   16 Nov 2004; Masatomo Nakano <nakano@gentoo.org>
   -files/bincimap-1.2.8-gentoo.diff, bincimap-1.2.10.ebuild,
diff --git a/net-mail/bincimap/Manifest b/net-mail/bincimap/Manifest
index 31940cd12335..2a9e65982a4d 100644
--- a/net-mail/bincimap/Manifest
+++ b/net-mail/bincimap/Manifest
@@ -1,8 +1,10 @@
 MD5 f544545742a19b84f06be29d675ca567 bincimap-1.2.9.ebuild 2469
 MD5 320968f1786c7719efac6be654e6d936 bincimap-1.2.10.ebuild 2469
+MD5 a104973bd7bcb1dab670efac22f25ad9 bincimap-1.3.3.ebuild 2465
 MD5 42457eaaf78dfced36e13050215bea6b ChangeLog 4042
 MD5 38f7e7e07cecf943cd078f4aef09fef1 metadata.xml 250
 MD5 bcca3e038e0e6e906cce64748ceacaae files/digest-bincimap-1.2.9 72
+MD5 d8c88c84a2f78e0b4c9f75fafd55ad67 files/digest-bincimap-1.3.3 67
 MD5 56784c856803c71ea3d91e738b08a115 files/bincimap-1.2.9-gentoo.diff 1426
 MD5 38fa3acb6f2128b825f1ef671b9c3349 files/digest-bincimap-1.2.10 73
 MD5 56784c856803c71ea3d91e738b08a115 files/bincimap-1.2.10-gentoo.diff 1426
diff --git a/net-mail/bincimap/bincimap-1.3.3.ebuild b/net-mail/bincimap/bincimap-1.3.3.ebuild
new file mode 100644
index 000000000000..509a5b487827
--- /dev/null
+++ b/net-mail/bincimap/bincimap-1.3.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.3.3.ebuild,v 1.1 2004/11/29 01:53:24 nakano Exp $
+
+inherit eutils
+
+DESCRIPTION="IMAP server for Maildir"
+SRC_URI="http://www.bincimap.org/dl/tarballs/1.3/${P}.tar.bz2"
+HOMEPAGE="http://www.bincimap.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="ssl"
+
+DEPEND="virtual/libc
+	ssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}
+	sys-apps/daemontools
+	sys-apps/ucspi-tcp
+	net-mail/checkpassword"
+
+PROVIDE="virtual/imapd"
+
+src_compile() {
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	econf `use_enable ssl ssl` --sysconfdir=/etc/bincimap \
+		--datadir=/usr/share/doc/${PF} \
+		--localstatedir=/etc/bincimap || die
+	emake || die
+}
+
+src_install () {
+	cd ${S}
+	make DESTDIR=${D} prefix=/usr install || die
+	keepdir /var/log/bincimap || die
+	if use ssl; then
+		keepdir /var/log/bincimap-ssl || die
+	fi
+
+	# backward compatibility
+	dosym /etc/bincimap/service/bincimap /etc/bincimap/service/imap
+	dosym /etc/bincimap/service/bincimaps /etc/bincimap/service/imaps
+
+	# rename
+	mv ${D}/etc/xinetd.d/{xinetd-bincimap,bincimap}
+	mv ${D}/etc/xinetd.d/{xinetd-bincimaps,bincimaps}
+}
+
+pkg_postinst() {
+	einfo "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
+	einfo "and create the following link:"
+	einfo "ln -sf /etc/bincimap/service/bincimap /service/"
+	einfo ""
+
+	if use ssl; then
+		einfo "If you want to use ssl connections, create the following link instead of above link."
+		einfo "ln -sf /etc/bincimap/service/bincimaps /service/"
+		einfo ""
+		einfo "And this command will setup bincimap-ssl on your system."
+		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+		einfo ""
+	fi
+
+	#einfo "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it, "
+	#einfo "edit /etc/bincimap/bincimap.conf"
+	#einfo ""
+}
+
+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.3.3-gentoo.diff b/net-mail/bincimap/files/bincimap-1.3.3-gentoo.diff
new file mode 100644
index 000000000000..df829f30f47c
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.3.3-gentoo.diff
@@ -0,0 +1,135 @@
+diff -Naru bincimap-1.3.3.org/Makefile.in bincimap-1.3.3/Makefile.in
+--- bincimap-1.3.3.org/Makefile.in	2004-11-09 20:18:55.000000000 +0000
++++ bincimap-1.3.3/Makefile.in	2004-11-19 09:54:41.000000000 +0000
+@@ -397,28 +397,28 @@
+ 	@$(BINC_INSTALL_CONF) $(srcdir)/conf/bincimap-localconfig $(DESTDIR)$(sysconfdir) 755
+ 	@echo
+ 	@echo "* Run files"
+-	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimap $(DESTDIR)$(sysconfdir)
+-	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimaps $(DESTDIR)$(sysconfdir)
++	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimap $(DESTDIR)/etc/xinetd.d
++	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimaps $(DESTDIR)/etc/xinetd.d
+ 	@echo
+ 	@echo "* Service/run files"
+-	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/run $(DESTDIR)$(datadir)/service/bincimap 755
+-	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/log/run $(DESTDIR)$(datadir)/service/bincimap/log 755
+-	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/log/run $(DESTDIR)$(datadir)/service/bincimaps/log 755
+-	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/run $(DESTDIR)$(datadir)/service/bincimaps 755
++	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/run $(DESTDIR)$(sysconfdir)/service/bincimap 755
++	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/log/run $(DESTDIR)$(sysconfdir)/service/bincimap/log 755
++	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/log/run $(DESTDIR)$(sysconfdir)/service/bincimaps/log 755
++	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/run $(DESTDIR)$(sysconfdir)/service/bincimaps 755
+ 	@echo
+ 	@echo "* Documentation"
+ 	@$(BINC_INSTALL_DOC) $(srcdir)/man/bincimap.1 $(DESTDIR)$(mandir)/man1
+-	@$(BINC_INSTALL_DOC) $(srcdir)/ChangeLog $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/AUTHORS $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING.OpenSSL $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/README $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/TODO $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-goals.html $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-imapdir.html $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-tech.html $(DESTDIR)$(datadir)/doc/bincimap
+-	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)/doc/bincimap
++	@$(BINC_INSTALL_DOC) $(srcdir)/ChangeLog $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/AUTHORS $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING.OpenSSL $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/README $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/TODO $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-goals.html $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-imapdir.html $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-tech.html $(DESTDIR)$(datadir)
++	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)
+ 	@echo
+ 	@echo "* Binaries"
+ 	@$(BINC_INSTALL_BIN) src/bincimapd $(DESTDIR)$(bindir)
+diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimap bincimap-1.3.3/conf/xinetd-bincimap
+--- bincimap-1.3.3.org/conf/xinetd-bincimap	2004-11-09 20:08:05.000000000 +0000
++++ bincimap-1.3.3/conf/xinetd-bincimap	2004-11-19 09:51:30.000000000 +0000
+@@ -13,14 +13,14 @@
+ # description: Binc IMAP
+ service imap
+ {
+-	disable		= no
++	disable		= yes
+ 	flags		= REUSE
+ 	socket_type	= stream        
+ 	wait		= no
+ 	user		= root
+ 	group		= root
+ 	instances	= UNLIMITED
+-	server		= /usr/local/etc/bincimap-config
+-	server_args	= /usr/local/bin/bincimap-up -- /bin/checkpassword /usr/local/etc/bincimap-localconfig /usr/local/bin/bincimapd Maildir
++	server		= /etc/bincimap/bincimap-config
++	server_args	= /usr/bin/bincimap-up -- /bin/checkpassword /etc/bincimap/bincimap-localconfig /usr/bin/bincimapd Maildir
+ 	log_type	= SYSLOG daemon info
+ }
+diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimap.in bincimap-1.3.3/conf/xinetd-bincimap.in
+--- bincimap-1.3.3.org/conf/xinetd-bincimap.in	2004-05-24 10:17:16.000000000 +0100
++++ bincimap-1.3.3/conf/xinetd-bincimap.in	2004-11-29 01:35:09.020518914 +0000
+@@ -13,7 +13,7 @@
+ # description: Binc IMAP
+ service imap
+ {
+-	disable		= no
++	disable		= yes
+ 	flags		= REUSE
+ 	socket_type	= stream        
+ 	wait		= no
+diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimaps bincimap-1.3.3/conf/xinetd-bincimaps
+--- bincimap-1.3.3.org/conf/xinetd-bincimaps	2004-11-09 20:08:05.000000000 +0000
++++ bincimap-1.3.3/conf/xinetd-bincimaps	2004-11-19 09:50:53.000000000 +0000
+@@ -13,14 +13,14 @@
+ # description: Binc IMAP, SSL
+ service imaps
+ {
+-	disable		= no
++	disable		= yes
+ 	flags		= REUSE
+ 	socket_type	= stream        
+ 	wait		= no
+ 	user		= root
+ 	group		= root
+ 	instances	= UNLIMITED
+-	server		= /usr/local/etc/bincimap-config
+-	server_args	= /usr/local/bin/bincimap-up --enable-ssl -- /bin/checkpassword /usr/local/etc/bincimap-localconfig /usr/local/bin/bincimapd Maildir
++	server		= /etc/bincimap/bincimap-config
++	server_args	= /usr/bin/bincimap-up --enable-ssl -- /bin/checkpassword /etc/bincimap/bincimap-localconfig /usr/bin/bincimapd Maildir
+ 	log_type	= SYSLOG daemon info
+ }
+diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimaps.in bincimap-1.3.3/conf/xinetd-bincimaps.in
+--- bincimap-1.3.3.org/conf/xinetd-bincimaps.in	2004-05-24 10:17:16.000000000 +0100
++++ bincimap-1.3.3/conf/xinetd-bincimaps.in	2004-11-29 01:35:20.008893378 +0000
+@@ -13,7 +13,7 @@
+ # description: Binc IMAP, SSL
+ service imaps
+ {
+-	disable		= no
++	disable		= yes
+ 	flags		= REUSE
+ 	socket_type	= stream        
+ 	wait		= no
+diff -Naru bincimap-1.3.3.org/service/plain/log/run.in bincimap-1.3.3/service/plain/log/run.in
+--- bincimap-1.3.3.org/service/plain/log/run.in	2004-06-17 21:37:33.000000000 +0100
++++ bincimap-1.3.3/service/plain/log/run.in	2004-11-16 14:52:51.000000000 +0000
+@@ -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.3.3.org/service/ssl/log/run.in bincimap-1.3.3/service/ssl/log/run.in
+--- bincimap-1.3.3.org/service/ssl/log/run.in	2004-06-17 21:37:33.000000000 +0100
++++ bincimap-1.3.3/service/ssl/log/run.in	2004-11-16 14:52:58.000000000 +0000
+@@ -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 --git a/net-mail/bincimap/files/digest-bincimap-1.3.3 b/net-mail/bincimap/files/digest-bincimap-1.3.3
new file mode 100644
index 000000000000..fe78db7a1849
--- /dev/null
+++ b/net-mail/bincimap/files/digest-bincimap-1.3.3
@@ -0,0 +1 @@
+MD5 9832585321464ba5cd1af3b4beb6c8b8 bincimap-1.3.3.tar.bz2 192389