add patch to fix access violation during configure.

4 files changed, 67 insertions, 24 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 0681db585a95..5120b824c366 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.43 2004/08/22 04:19:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.44 2004/08/23 00:02:07 langthang Exp $
+
+  22 Aug 2004; Tuan Van <langthang@gentoo.org>
+  +files/vpopmail-5.4.6-access.violation.patch, vpopmail-5.4.6-r1.ebuild:
+  add patch for access violation during configure.
 
   21 Aug 2004; Jason Wever <weeve@gentoo.org> vpopmail-5.4.6-r1.ebuild:
   Stable on sparc wrt security bug #60844.
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 658032d71e59..9b68dd9677fb 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,33 +1,44 @@
-MD5 dab8c1a8fce3d4a7031d3bb79a64957a ChangeLog 7097
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 5c75d54e8924b414cba1dda30a7181e4 vpopmail-5.2.1-r5.ebuild 6062
-MD5 39aa2505d0a7cf2d02650d8cdf4b187c vpopmail-5.2.1-r6.ebuild 6380
-MD5 ac097e29d83d3347f7773eb8e73341ab vpopmail-5.2.1-r7.ebuild 6379
-MD5 3886587ecb82bfa71669f27a2880f8f5 vpopmail-5.2.1-r8.ebuild 6724
-MD5 98eb520388c505ec8e99f8fdf5f33d3a vpopmail-5.2.1-r9.ebuild 7567
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5867b54ad82fc3de202fa5cb7afccca2 vpopmail-5.2.2-r1.ebuild 7487
-MD5 8359e63e0c39d804533dc59a4f8b53cb vpopmail-5.2.2.ebuild 7487
-MD5 0bc96064a9872b49c094b93f24e9f909 vpopmail-5.4.0_rc1.ebuild 8362
 MD5 0f45c195f993f33c78c2a6d98108a3c8 vpopmail-5.4.0.ebuild 7429
 MD5 a6fbf86e82e7039d4256fdd6c1a38bcb vpopmail-5.4.0-r1.ebuild 7410
+MD5 98eb520388c505ec8e99f8fdf5f33d3a vpopmail-5.2.1-r9.ebuild 7567
+MD5 39aa2505d0a7cf2d02650d8cdf4b187c vpopmail-5.2.1-r6.ebuild 6380
+MD5 3886587ecb82bfa71669f27a2880f8f5 vpopmail-5.2.1-r8.ebuild 6724
+MD5 0640b5081eec0b42b4a8cad733eba956 vpopmail-5.4.6-r1.ebuild 7636
+MD5 0bc96064a9872b49c094b93f24e9f909 vpopmail-5.4.0_rc1.ebuild 8362
 MD5 9cb9f545f72335fc7ba8402d9c616d01 vpopmail-5.4.6.ebuild 7499
-MD5 323205da12113005cecbe1f7c3f48e36 vpopmail-5.4.6-r1.ebuild 7521
+MD5 5c75d54e8924b414cba1dda30a7181e4 vpopmail-5.2.1-r5.ebuild 6062
+MD5 8359e63e0c39d804533dc59a4f8b53cb vpopmail-5.2.2.ebuild 7487
+MD5 5e7f8de9e3287442651611b8dad0f849 ChangeLog 7274
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 ac097e29d83d3347f7773eb8e73341ab vpopmail-5.2.1-r7.ebuild 6379
+MD5 c8f37f4f0e61e7c848351d7e4a38478f files/vpopmail-Maildir-dotmaildir-fix.sh 931
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
+MD5 ceafe640132b1326bbc71949e8bccd1c files/vpopmail-5.2.1-gcc33mysql.diff 554
+MD5 d0bc9f5393a1f0602c71fdee0b3d2cd8 files/digest-vpopmail-5.2.2 134
+MD5 d3296e78f37859945cfe766afb969dc2 files/digest-vpopmail-5.4.0 134
+MD5 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6 66
+MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
+MD5 2a9fe0fff0522f424c0faf7db8f690a9 files/digest-vpopmail-5.4.0_rc1 138
 MD5 d388c60820d1ce87e90cbc46a89c6a77 files/digest-vpopmail-5.2.1-r5 327
 MD5 61705fcd13006df869646877d966fac8 files/digest-vpopmail-5.2.1-r6 134
 MD5 61705fcd13006df869646877d966fac8 files/digest-vpopmail-5.2.1-r7 134
 MD5 61705fcd13006df869646877d966fac8 files/digest-vpopmail-5.2.1-r8 134
 MD5 61705fcd13006df869646877d966fac8 files/digest-vpopmail-5.2.1-r9 134
-MD5 d0bc9f5393a1f0602c71fdee0b3d2cd8 files/digest-vpopmail-5.2.2 134
 MD5 d0bc9f5393a1f0602c71fdee0b3d2cd8 files/digest-vpopmail-5.2.2-r1 134
-MD5 2a9fe0fff0522f424c0faf7db8f690a9 files/digest-vpopmail-5.4.0_rc1 138
-MD5 ceafe640132b1326bbc71949e8bccd1c files/vpopmail-5.2.1-gcc33mysql.diff 554
-MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
-MD5 c8f37f4f0e61e7c848351d7e4a38478f files/vpopmail-Maildir-dotmaildir-fix.sh 931
-MD5 851f9c731b7d03472a08ee21c046823d files/vpopmail.clearopensmtp 235
-MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
-MD5 9aeca181f86314f09d9cfe99ebe8b7d0 files/vpopmail.diff 2101
-MD5 d3296e78f37859945cfe766afb969dc2 files/digest-vpopmail-5.4.0 134
 MD5 d3296e78f37859945cfe766afb969dc2 files/digest-vpopmail-5.4.0-r1 134
-MD5 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6 66
 MD5 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6-r1 66
+MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
+MD5 9aeca181f86314f09d9cfe99ebe8b7d0 files/vpopmail.diff 2101
+MD5 851f9c731b7d03472a08ee21c046823d files/vpopmail.clearopensmtp 235
+MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.6-access.violation.patch 918
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+
+iD8DBQFBKTco5FrxP71izLARAjUTAKCaMvA2dLbHAXuB6i7CEA+Ns2YuxgCgjQKo
+/hFnAOJEva9lbuqeDfxp5/A=
+=nuv0
+-----END PGP SIGNATURE-----
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.6-access.violation.patch b/net-mail/vpopmail/files/vpopmail-5.4.6-access.violation.patch
new file mode 100644
index 000000000000..7a31fa9a3d3e
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.4.6-access.violation.patch
@@ -0,0 +1,27 @@
+--- configure.in.org	2004-06-30 22:11:08.000000000 -0700
++++ configure.in	2004-08-22 16:45:36.279473008 -0700
+@@ -463,16 +463,16 @@
+   if test ! -d $vpopmaildir
+   then
+     AC_MSG_WARN( creating $vpopmaildir )
+-    mkdir -p $vpopmaildir
+-    chown $vpopmailuid $vpopmaildir
+-    chgrp $vpopmailgid $vpopmaildir
+-    chmod 755 $vpopmaildir
++    mkdir -p ${D}/$vpopmaildir
++    chown $vpopmailuid ${D}/$vpopmaildir
++    chgrp $vpopmailgid ${D}/$vpopmaildir
++    chmod 755 ${D}/$vpopmaildir
+   fi
+   AC_MSG_WARN( making a vpopmail etc directory )
+-  mkdir $vpopmaildir/etc
+-  chown $vpopmailuid "$vpopmaildir"/etc
+-  chgrp $vpopmailgid "$vpopmaildir"/etc
+-  chmod 755 "$vpopmaildir"/etc
++  mkdir ${D}/$vpopmaildir/etc
++  chown $vpopmailuid ${D}/$vpopmaildir/etc
++  chgrp $vpopmailgid ${D}/$vpopmaildir/etc
++  chmod 755 ${D}/$vpopmaildir/etc
+ fi
+ 
+ #----------------------------------------------------------------------
diff --git a/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild
index b7bdda276e07..b57ccba51023 100644
--- a/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild,v 1.2 2004/08/22 04:19:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild,v 1.3 2004/08/23 00:02:08 langthang Exp $
 
 inherit eutils gnuconfig fixheadtails
 
@@ -59,7 +59,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch || die "failed to patch."
-
+	epatch ${FILESDIR}/${P}-access.violation.patch || die "failed to patch."
 	sed -i \
 		's|Maildir|.maildir|g' \
 		vchkpw.c vconvert.c vdelivermail.c \
@@ -72,6 +72,7 @@ src_unpack() {
 		|| die "failed to remove vpopmail advertisement"
 
 	gnuconfig_update
+	autoconf || die "reconfigure failed."
 	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
 }
 
@@ -124,7 +125,7 @@ src_compile() {
 	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
 	#--disable-rebuild-tcpserver-file \
 
-	emake || die "Make failed."
+	make || die "Make failed."
 }
 
 src_install() {