[patch] courier-imap-4.0.2.patch

courier-imap-4.0.2.patch (text/plain), 4.53 KB, created by Diego Elio Pettenò (RETIRED) on 2005-04-12 20:27:26 UTC

--- /usr/portage/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild	2005-04-09 15:05:50.000000000 +0200
+++ courier-imap-4.0.2.ebuild	2005-04-13 05:05:09.890979264 +0200
@@ -25,12 +25,13 @@
 	fam? ( virtual/fam )
 	selinux? ( sec-policy/selinux-courier-imap )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	dev-lang/perl
-	sys-process/procps
 	!mail-mta/courier"
 PROVIDE="virtual/imapd"
 
+RC_VER="4.0.1-r1"
+INITD_VER="4.0.1"
+
 #S=${WORKDIR}/${PN}-${MY_PV}
 pkg_setup() {
 	if ! use berkdb && ! use gdbm; then
@@ -98,8 +99,7 @@
 	vpopmail_setup
 
 	local myconf
-	myconf="$(use_with ipv6)"
-
+	
 	# 19 Aug 2004; [e-mail]
 	# default to gdbm if both berkdb and gdbm present.
 	if use gdbm; then
@@ -142,13 +142,6 @@
 
 	use debug && myconf="${myconf} debug=true"
 
-	# fix for bug #27528
-	# they really should use a better way to detect redhat
-	myconf="${myconf} --without-redhat"
-
-	# bug #29879 - FAM support
-	myconf="${myconf} $(use_with fam)"
-
 	# bug #76592
 	# configure cache confuses the configure script. 
 	#local cachefile
@@ -176,15 +169,17 @@
 		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
 		--with-mailuser=mail \
 		--with-mailgroup=mail \
+		$(use_with ipv6) \
+		$(use_with fam) \
 		${myconf} || die "econf failed"
 
 	# change the pem file location..
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		-i.orig imap/imapd-ssl.dist || \
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
 		die "sed failed"
 
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		-i.orig imap/pop3d-ssl.dist || \
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist || \
 		die "sed failed"
 
 	emake || die "compile problem"
@@ -213,13 +208,9 @@
 		for type in "" "-ssl"; do
 			local file
 			file="${service}${type}.rc"
-			#cp ${file} ${file}.orig
-			#sed -e 's/Maildir/${MAILDIR}/' \
-			#    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-			#	${file}.orig > ${file}
-			sed -e 's/Maildir/${MAILDIR}/' \
-				-e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				-i.orig ${file} || die "sed failed"
+			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
+			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+				${file} || die "sed failed"
 		done
 	done
 
@@ -273,19 +264,18 @@
 	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
 			die "dosym failed"
 
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/${P}-courier-imapd.rc6 courier-imapd || die "newexe failed"
-		newexe ${FILESDIR}/${P}-courier-imapd-ssl.rc6 courier-imapd-ssl || die "newexe failed"
-		newexe ${FILESDIR}/${P}-courier-pop3d.rc6 courier-pop3d || die "newexe failed"
-		newexe ${FILESDIR}/${P}-courier-pop3d-ssl.rc6 courier-pop3d-ssl || die "newexe failed"
+	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-imapd.rc6 courier-imapd || die "newinitd failed"
+	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-imapd-ssl.rc6 courier-imapd-ssl || die "newinitd failed"
+	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-pop3d.rc6 courier-pop3d || die "newinitd failed"
+	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-pop3d-ssl.rc6 courier-pop3d-ssl || die "newinitd failed"
 
 	exeinto /usr/$(get_libdir)/courier-imap
-		newexe ${FILESDIR}/${P}-r1-gentoo-imapd.rc gentoo-imapd.rc || die "newexe failed"
-		newexe ${FILESDIR}/${P}-r1-gentoo-imapd-ssl.rc gentoo-imapd-ssl.rc || die "newexe failed"
-		newexe ${FILESDIR}/${P}-r1-gentoo-pop3d.rc gentoo-pop3d.rc || die "newexe failed"
-		newexe ${FILESDIR}/${P}-r1-gentoo-pop3d-ssl.rc gentoo-pop3d-ssl.rc || die "newexe failed"
-		newexe ${FILESDIR}/${P}-r1-courier-imapd.indirect courier-imapd.indirect || die "newexe failed"
-		newexe ${FILESDIR}/${P}-r1-courier-pop3d.indirect courier-pop3d.indirect || die "newexe failed"
+		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-imapd.rc gentoo-imapd.rc || die "newexe failed"
+		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-imapd-ssl.rc gentoo-imapd-ssl.rc || die "newexe failed"
+		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-pop3d.rc gentoo-pop3d.rc || die "newexe failed"
+		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-pop3d-ssl.rc gentoo-pop3d-ssl.rc || die "newexe failed"
+		newexe ${FILESDIR}/${PN}-${RC_VER}-courier-imapd.indirect courier-imapd.indirect || die "newexe failed"
+		newexe ${FILESDIR}/${PN}-${RC_VER}-courier-pop3d.indirect courier-pop3d.indirect || die "newexe failed"
 
 	#local authmods
 	#authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"