insecure runpaths as per security bug #105721 resulted in 2.2.0-r1 and 2.0.6-r1. version bump to 2.2.1 as per bug #106781 by David Somers

Package-Manager: portage-2.0.52-r1

11 files changed, 170 insertions, 6 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index f6c2c9909e82..fafd918aad54 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-util/cmake
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.20 2005/09/02 19:37:30 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.21 2005/09/26 10:37:03 dragonheart Exp $
+
+*cmake-2.2.1 (26 Sep 2005)
+*cmake-2.2.0-r1 (26 Sep 2005)
+*cmake-2.0.6-r1 (26 Sep 2005)
+
+  26 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/cmake-2.0.6-rpath-fix.patch, +files/cmake-2.2.0-rpath-fix.patch,
+  +files/cmake-2.2.1-rpath-fix.patch, +cmake-2.0.6-r1.ebuild,
+  -cmake-2.2.0.ebuild, +cmake-2.2.0-r1.ebuild, +cmake-2.2.1.ebuild:
+  insecure runpaths as per security bug #105721 resulted in 2.2.0-r1 and
+  2.0.6-r1. Thanks Ashu Tiwary. version bump to 2.2.1 as per bug #106781 by
+  David Somers
 
   02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> cmake-2.0.6.ebuild:
   Stable on ppc.
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index f4d97cf96b29..70f3cfa8dd3f 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,8 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9284e2f2c1af67f999a793be06af8ef9 cmake-2.0.5.ebuild 791
 MD5 c7008534123f6886fbc11f82417c0b39 metadata.xml 347
-MD5 93bcae9fd087dfe6f4ab9f22c512d059 ChangeLog 2918
+MD5 c3d999071e6827fb71686b0e19849279 ChangeLog 3433
 MD5 535056ed03ebcf34e1cb4ff3f97424c0 cmake-2.0.6.ebuild 907
-MD5 9c913b69851732891574702f6dcb9e73 cmake-2.2.0.ebuild 976
+MD5 30e99f7c6e1f5025d89a90a836f45b52 cmake-2.2.1.ebuild 1220
+MD5 a959a6103f04ad2383ccec8c6d0936e8 cmake-2.2.0-r1.ebuild 1223
+MD5 ff8b2e9d4e8d7cb5c6fcd50682c9fe21 cmake-2.0.6-r1.ebuild 1011
 MD5 beb07080ff2955d2e023b17bc15e6b67 files/digest-cmake-2.0.6 64
-MD5 6b3e76d4d01f10ed7f93bb39cc603f8c files/digest-cmake-2.2.0 64
+MD5 a1a51ec90e30f352bb6f0aa3822083e7 files/digest-cmake-2.2.1 64
+MD5 6b3e76d4d01f10ed7f93bb39cc603f8c files/digest-cmake-2.2.0-r1 64
 MD5 583f594b8088c13f635368d141de40cb files/digest-cmake-2.0.5 64
+MD5 beb07080ff2955d2e023b17bc15e6b67 files/digest-cmake-2.0.6-r1 64
+MD5 dd14e025d4b768e7ea416902ddc0b756 files/cmake-2.2.0-rpath-fix.patch 448
+MD5 cc142b07505b203f41d024728adb130f files/cmake-2.0.6-rpath-fix.patch 526
+MD5 c47657a48f7a256e7cd145d89274b9f1 files/cmake-2.2.1-rpath-fix.patch 444
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDN89mmdTrptrqvGERAsu5AJ4o69sDBNYiD8xUHpVULmsYTJFIngCggmPM
+aeuGM6pcxYKncgJ4bO5HACg=
+=KMBV
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.0.6-r1.ebuild b/dev-util/cmake/cmake-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..5e8a4d8fc1f6
--- /dev/null
+++ b/dev-util/cmake/cmake-2.0.6-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.0.6-r1.ebuild,v 1.1 2005/09/26 10:37:03 dragonheart Exp $
+
+inherit debug flag-o-matic toolchain-funcs eutils
+
+SHORT_PV=2.0
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v${SHORT_PV}/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ppc ~sparc x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-rpath-fix.patch
+}
+
+src_compile() {
+	strip-flags
+	./bootstrap \
+		--prefix=/usr \
+		--docdir=/share/doc/${PN} \
+		--datadir=/share/${PN} \
+		--mandir=/share/man || die "./bootstrap failed"
+	emake || die
+}
+
+src_test() {
+	einfo "Self tests broken"
+	#make test || einfo "note test failure on #17 was expected"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "install failed"
+	mv ${D}usr/share/doc/cmake ${D}usr/share/doc/${PF}
+}
diff --git a/dev-util/cmake/cmake-2.2.0-r1.ebuild b/dev-util/cmake/cmake-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..e44e7f5b6ca2
--- /dev/null
+++ b/dev-util/cmake/cmake-2.2.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.2.0-r1.ebuild,v 1.1 2005/09/26 10:37:03 dragonheart Exp $
+
+inherit debug flag-o-matic qt3 toolchain-funcs eutils
+
+SHORT_PV=2.2
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v${SHORT_PV}/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-rpath-fix.patch
+	sed -i -e "s:g++:$(tc-getCXX):" \
+		${S}/Modules/CMakeCXXInformation.cmake
+	sed -i -e "s:gcc:$(tc-getCC):" \
+		${S}/Modules/CMakeCInformation.cmake
+}
+
+src_compile() {
+	strip-flags
+	./bootstrap \
+		--prefix=/usr \
+		--docdir=/share/doc/${PN} \
+		--datadir=/share/${PN} \
+		--mandir=/share/man || die "./bootstrap failed"
+	emake || die
+}
+
+src_test() {
+	einfo "Self tests broken"
+	make test || \
+		einfo "note test failure on qtwrapping was expected - nature of portage rather than a true failure"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "install failed"
+	mv ${D}usr/share/doc/cmake ${D}usr/share/doc/${PF}
+}
diff --git a/dev-util/cmake/cmake-2.2.0.ebuild b/dev-util/cmake/cmake-2.2.1.ebuild
index 743dc92e7530..89a04bb51c8c 100644
--- a/dev-util/cmake/cmake-2.2.0.ebuild
+++ b/dev-util/cmake/cmake-2.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.2.0.ebuild,v 1.1 2005/08/20 11:45:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.2.1.ebuild,v 1.1 2005/09/26 10:37:03 dragonheart Exp $
 
-inherit debug flag-o-matic qt3
+inherit debug flag-o-matic qt3 toolchain-funcs eutils
 
 SHORT_PV=2.2
 
@@ -17,6 +17,15 @@ IUSE=""
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-rpath-fix.patch
+	sed -i -e "s:g++:$(tc-getCXX):" \
+		${S}/Modules/CMakeCXXInformation.cmake
+	sed -i -e "s:gcc:$(tc-getCC):" \
+		${S}/Modules/CMakeCInformation.cmake
+}
+
 src_compile() {
 	strip-flags
 	./bootstrap \
diff --git a/dev-util/cmake/files/cmake-2.0.6-rpath-fix.patch b/dev-util/cmake/files/cmake-2.0.6-rpath-fix.patch
new file mode 100644
index 000000000000..9cd3347015c8
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.0.6-rpath-fix.patch
@@ -0,0 +1,11 @@
+--- ./cmake-2.0.6/Modules/CMakeSystemSpecificInformation.cmake.orig	2005-09-26 08:05:28.000000000 +1000
++++ ./cmake-2.0.6/Modules/CMakeSystemSpecificInformation.cmake	2005-09-26 08:05:37.000000000 +1000
+@@ -34,7 +34,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+ 
+-SET (CMAKE_SKIP_RPATH "NO" CACHE BOOL
++SET (CMAKE_SKIP_RPATH "YES" CACHE BOOL
+      "If set, runtime paths are not added when using shared libraries.")
+ MARK_AS_ADVANCED(CMAKE_SKIP_RPATH)
+ # 2. now include SystemName.cmake file to set the system specific information
diff --git a/dev-util/cmake/files/cmake-2.2.0-rpath-fix.patch b/dev-util/cmake/files/cmake-2.2.0-rpath-fix.patch
new file mode 100644
index 000000000000..bdf542d8236c
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.2.0-rpath-fix.patch
@@ -0,0 +1,11 @@
+--- cmake-2.2.0/./Modules/CMakeGenericSystem.cmake.orig	2005-09-26 07:49:25.000000000 +1000
++++ cmake-2.2.0/./Modules/CMakeGenericSystem.cmake	2005-09-26 07:49:38.000000000 +1000
+@@ -21,7 +21,7 @@
+   SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fPIC")   # -pic
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+-SET (CMAKE_SKIP_RPATH "NO" CACHE BOOL
++SET (CMAKE_SKIP_RPATH "YES" CACHE BOOL
+      "If set, runtime paths are not added when using shared libraries.")
+ 
+    
diff --git a/dev-util/cmake/files/cmake-2.2.1-rpath-fix.patch b/dev-util/cmake/files/cmake-2.2.1-rpath-fix.patch
new file mode 100644
index 000000000000..124c90ebb0fa
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.2.1-rpath-fix.patch
@@ -0,0 +1,11 @@
+--- cmake-2.2.1/Modules/CMakeGenericSystem.cmake.orig	2005-09-26 07:49:25.000000000 +1000
++++ cmake-2.2.1/Modules/CMakeGenericSystem.cmake	2005-09-26 07:49:38.000000000 +1000
+@@ -21,7 +21,7 @@
+   SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fPIC")   # -pic
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+-SET (CMAKE_SKIP_RPATH "NO" CACHE BOOL
++SET (CMAKE_SKIP_RPATH "YES" CACHE BOOL
+      "If set, runtime paths are not added when using shared libraries.")
+ 
+    
diff --git a/dev-util/cmake/files/digest-cmake-2.0.6-r1 b/dev-util/cmake/files/digest-cmake-2.0.6-r1
new file mode 100644
index 000000000000..d1fad6b577a3
--- /dev/null
+++ b/dev-util/cmake/files/digest-cmake-2.0.6-r1
@@ -0,0 +1 @@
+MD5 840ea86d7f1a56b469052c9cabbeac54 cmake-2.0.6.tar.gz 1632052
diff --git a/dev-util/cmake/files/digest-cmake-2.2.0 b/dev-util/cmake/files/digest-cmake-2.2.0-r1
index 2c598021d5e7..2c598021d5e7 100644
--- a/dev-util/cmake/files/digest-cmake-2.2.0
+++ b/dev-util/cmake/files/digest-cmake-2.2.0-r1
diff --git a/dev-util/cmake/files/digest-cmake-2.2.1 b/dev-util/cmake/files/digest-cmake-2.2.1
new file mode 100644
index 000000000000..5360cdfe6f40
--- /dev/null
+++ b/dev-util/cmake/files/digest-cmake-2.2.1
@@ -0,0 +1 @@
+MD5 0b8ea4304901a2c4374fb0d1c313834a cmake-2.2.1.tar.gz 2420253