From 8b5881463e96c37e0463e17b2286ebd86cbd0243 Mon Sep 17 00:00:00 2001
From: Michael Cummings <mcummings@gentoo.org>
Date: Tue, 28 Sep 2004 08:50:52 +0000
Subject: Bug 64823 - perlsuid added back as an l local use flag

---
 dev-lang/perl/ChangeLog            |  8 +++++-
 dev-lang/perl/Manifest             | 56 ++++++++++++++++----------------------
 dev-lang/perl/perl-5.8.2-r1.ebuild | 13 +++++++--
 dev-lang/perl/perl-5.8.3.ebuild    | 13 +++++++--
 dev-lang/perl/perl-5.8.4-r1.ebuild | 19 +++++++++----
 dev-lang/perl/perl-5.8.4.ebuild    | 13 +++++++--
 dev-lang/perl/perl-5.8.5.ebuild    | 18 ++++++++----
 7 files changed, 87 insertions(+), 53 deletions(-)

(limited to 'dev-lang/perl')

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 1704db170fbd..b24c31eddc9e 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.88 2004/09/27 17:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.89 2004/09/28 08:50:52 mcummings Exp $
+
+  28 Sep 2004; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  Added back perlsuid/sperl based on local use flag. Bug 64823. Users should
+  read http://perldoc.com/perl5.8.4/INSTALL.html#suidperl before enabling.
 
   27 Sep 2004; Mike Frysinger <vapier@gentoo.org> perl-5.8.2-r1.ebuild,
   perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index b26d414ae36d..b3a5b66e9a91 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,47 +1,37 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c56f744c486258dd02d8966eda2b1a1b ChangeLog 28903
+MD5 dea8dfaedf16a29ca87b485ea337033b perl-5.8.2-r1.ebuild 10001
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 b586eafcb1bd8808ee9162c373fed2c7 perl-5.8.2-r1.ebuild 9812
-MD5 12228601c0b002cb8029d0e890a79007 perl-5.8.3.ebuild 9781
-MD5 100a8ed6cf6f3cd470095386aff55265 perl-5.8.4-r1.ebuild 11891
-MD5 c9346e983cfc8f78407efe7dda56fd3e perl-5.8.4.ebuild 10577
-MD5 39caac050c4dd81b1812c22304b3f5f3 perl-5.8.5.ebuild 11254
+MD5 0bc990c4e9fd23d89e90e12628bedbd9 ChangeLog 29219
+MD5 ea5b082a979f5f8da02044b0780a177f perl-5.8.3.ebuild 9970
+MD5 bbc42907cef2f9eb3fbe9105a74a6a64 perl-5.8.4-r1.ebuild 12141
+MD5 b44e14c6d515db6d2b65b50970b40dad perl-5.8.4.ebuild 10766
+MD5 d4a12b08f4dc187d4447975621c96f18 perl-5.8.5.ebuild 11503
+MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r1 64
+MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-perl-5.8.3 64
 MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4 64
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.4-perldoc-emptydirs.patch 489
-MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.4-picdl.patch 250
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.4-reorder-INC.patch 2211
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.4-prelink-lpthread.patch 476
-MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.4-noksh.patch 611
-MD5 ce442db939c59218a16be167f793b817 files/perl-5.8.2-uclibc.patch 573
 MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4-r1 64
-MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-perl-5.8.3 64
-MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
-MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r1 64
 MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5 64
 MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.4-nonblock.patch 400
-MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.5-noksh.patch 611
-MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.5-nonblock.patch 400
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.5-perldoc-emptydirs.patch 489
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211
+MD5 ce442db939c59218a16be167f793b817 files/perl-5.8.2-uclibc.patch 573
 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.3-perldoc-emptydirs.patch 489
 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.3-picdl.patch 250
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.3-prelink-lpthread.patch 476
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.3-reorder-INC.patch 2211
+MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.4-noksh.patch 611
+MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.4-nonblock.patch 400
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.4-perldoc-emptydirs.patch 489
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.4-picdl.patch 250
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.4-prelink-lpthread.patch 476
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.4-reorder-INC.patch 2211
+MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.5-noksh.patch 611
+MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.5-nonblock.patch 400
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.5-perldoc-emptydirs.patch 489
 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.5-picdl.patch 250
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.5-prelink-lpthread.patch 476
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.5-reorder-INC.patch 2211
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489
-MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211
 MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBWFO6HTu7gpaalycRAoULAJwPTXdvabgv5eptSfyYKnpfMQwGhgCgycI1
-ltRrOUz+m1cZjHNJpQ3nk+I=
-=20Hq
------END PGP SIGNATURE-----
diff --git a/dev-lang/perl/perl-5.8.2-r1.ebuild b/dev-lang/perl/perl-5.8.2-r1.ebuild
index 484504cebfea..1af220db2fb5 100644
--- a/dev-lang/perl/perl-5.8.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.2-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/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.21 2004/09/27 17:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.22 2004/09/28 08:50:52 mcummings Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -17,7 +17,7 @@ SLOT="0"
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
 KEYWORDS="x86 amd64 sparc ppc alpha mips hppa ia64 ppc64"
-IUSE="berkdb debug doc gdbm ithreads uclibc"
+IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
 
 DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
@@ -151,6 +151,14 @@ src_compile() {
 		CFLAGS="${CFLAGS} -g"
 	fi
 
+	if use perlsuid
+	then
+		myconf="${myconf} -Dd_dosuid"
+		ewarn "You have enabled Perl's suid compile. Please"
+		ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl"
+		epause 3
+	fi
+
 	if use sparc
 	then
 		myconf="${myconf} -Ud_longdbl"
@@ -180,7 +188,6 @@ src_compile() {
 		-Dlocincpth=' ' \
 		-Doptimize="${CFLAGS}" \
 		-Duselargefiles \
-		-Dd_dosuid \
 		-Dd_semctl_semun \
 		-Dscriptdir=/usr/bin \
 		-Dman3ext='3pm' \
diff --git a/dev-lang/perl/perl-5.8.3.ebuild b/dev-lang/perl/perl-5.8.3.ebuild
index 70c5e16a5603..b70010d03757 100644
--- a/dev-lang/perl/perl-5.8.3.ebuild
+++ b/dev-lang/perl/perl-5.8.3.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/dev-lang/perl/perl-5.8.3.ebuild,v 1.14 2004/09/27 17:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.3.ebuild,v 1.15 2004/09/28 08:50:52 mcummings Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -17,7 +17,7 @@ LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64 s390"
-IUSE="berkdb debug doc gdbm ithreads"
+IUSE="berkdb debug doc gdbm ithreads perlsuid"
 
 DEPEND="sys-apps/groff
 	berkdb? ( sys-libs/db )
@@ -145,6 +145,14 @@ src_compile() {
 		myconf="${myconf} -Dd_u32align"
 	fi
 
+	if use perlsuid
+	then
+		myconf="${myconf} -Dd_dosuid"
+		ewarn "You have enabled Perl's suid compile. Please"
+		ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl"
+		epause 3
+	fi
+
 	if use debug
 	then
 		CFLAGS="${CFLAGS} -g"
@@ -179,7 +187,6 @@ src_compile() {
 		-Dlocincpth=' ' \
 		-Doptimize="${CFLAGS}" \
 		-Duselargefiles \
-		-Dd_dosuid \
 		-Dd_semctl_semun \
 		-Dscriptdir=/usr/bin \
 		-Dman3ext='3pm' \
diff --git a/dev-lang/perl/perl-5.8.4-r1.ebuild b/dev-lang/perl/perl-5.8.4-r1.ebuild
index 782bb9c07b27..fd1ee2a2e788 100644
--- a/dev-lang/perl/perl-5.8.4-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.4-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/dev-lang/perl/perl-5.8.4-r1.ebuild,v 1.14 2004/09/27 17:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r1.ebuild,v 1.15 2004/09/28 08:50:52 mcummings Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -17,7 +17,7 @@ LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc mips alpha arm ~hppa amd64 ~ia64 ~ppc64 ~s390"
-IUSE="berkdb debug doc gdbm ithreads uclibc"
+IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
 
 DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
@@ -152,6 +152,7 @@ src_configure() {
 		mygdbm='D'
 		myndbm='D'
 	fi
+
 	if use berkdb
 	then
 		mydb='D'
@@ -168,6 +169,14 @@ src_configure() {
 		myconf="${myconf} -Dd_u32align"
 	fi
 
+	if use perlsuid
+	then
+		myconf="${myconf} -Dd_dosuid"
+		ewarn "You have enabled Perl's suid compile. Please"
+		ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl"
+		epause 3
+	fi
+
 	if use debug
 	then
 		CFLAGS="${CFLAGS} -g"
@@ -202,7 +211,6 @@ src_configure() {
 		-Dlocincpth=' ' \
 		-Doptimize="${CFLAGS}" \
 		-Duselargefiles \
-		-Dd_dosuid \
 		-Dd_semctl_semun \
 		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
@@ -268,8 +276,9 @@ src_install() {
 	# delete suidperl entirely.  if this causes outrage, here's where
 	# to fix.
 
-	rm ${D}/usr/bin/sperl${PV}
-	rm ${D}/usr/bin/suidperl
+	# Moved to a use flag enablement - bug 64823 - mcummings
+	#rm ${D}/usr/bin/sperl${PV}
+	#rm ${D}/usr/bin/suidperl
 	rm ${D}/usr/bin/perl
 	ln -s perl${PV} ${D}/usr/bin/perl
 
diff --git a/dev-lang/perl/perl-5.8.4.ebuild b/dev-lang/perl/perl-5.8.4.ebuild
index 1ea2eff200ea..650170f71e4a 100644
--- a/dev-lang/perl/perl-5.8.4.ebuild
+++ b/dev-lang/perl/perl-5.8.4.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/dev-lang/perl/perl-5.8.4.ebuild,v 1.25 2004/09/27 17:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4.ebuild,v 1.26 2004/09/28 08:50:52 mcummings Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -17,7 +17,7 @@ LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~mips alpha ~arm hppa amd64 ~ia64 ~ppc64 s390"
-IUSE="berkdb debug doc gdbm ithreads uclibc"
+IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
 
 DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
@@ -157,6 +157,14 @@ src_compile() {
 		myconf="${myconf} -Dd_u32align"
 	fi
 
+	if use perlsuid
+	then
+		myconf="${myconf} -Dd_dosuid"
+		ewarn "You have enabled Perl's suid compile. Please"
+		ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl"
+		epause 3
+	fi
+
 	if use debug
 	then
 		CFLAGS="${CFLAGS} -g"
@@ -191,7 +199,6 @@ src_compile() {
 		-Dlocincpth=' ' \
 		-Doptimize="${CFLAGS}" \
 		-Duselargefiles \
-		-Dd_dosuid \
 		-Dd_semctl_semun \
 		-Dscriptdir=/usr/bin \
 		-Dman3ext='3pm' \
diff --git a/dev-lang/perl/perl-5.8.5.ebuild b/dev-lang/perl/perl-5.8.5.ebuild
index 24220e1521c9..d25d5c828a5b 100644
--- a/dev-lang/perl/perl-5.8.5.ebuild
+++ b/dev-lang/perl/perl-5.8.5.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/dev-lang/perl/perl-5.8.5.ebuild,v 1.8 2004/09/27 17:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5.ebuild,v 1.9 2004/09/28 08:50:52 mcummings Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -17,7 +17,7 @@ LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="berkdb debug doc gdbm ithreads uclibc"
+IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
 
 DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
@@ -161,6 +161,14 @@ src_configure() {
 		myconf="${myconf} -Dd_u32align"
 	fi
 
+	if use perlsuid
+	then
+		myconf="${myconf} -Dd_dosuid"
+		ewarn "You have enabled Perl's suid compile. Please"
+		ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl"
+		epause 3
+	fi
+
 	if use debug
 	then
 		CFLAGS="${CFLAGS} -g"
@@ -188,7 +196,6 @@ src_configure() {
 		-Dlocincpth=' ' \
 		-Doptimize="${CFLAGS}" \
 		-Duselargefiles \
-		-Dd_dosuid \
 		-Dd_semctl_semun \
 		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
@@ -254,8 +261,9 @@ src_install() {
 	# delete suidperl entirely.  if this causes outrage, here's where
 	# to fix.
 
-	rm ${D}/usr/bin/sperl${PV}
-	rm ${D}/usr/bin/suidperl
+	# Moved to a use flag enablement - bug 64823 - mcummings
+	#rm ${D}/usr/bin/sperl${PV}
+	#rm ${D}/usr/bin/suidperl
 	rm ${D}/usr/bin/perl
 	ln -s perl${PV} ${D}/usr/bin/perl
 
-- 
cgit v1.2.3-65-gdbad