Version bump.

Package-Manager: portage-2.1.4

7 files changed, 72 insertions, 28 deletions

diff --git a/dev-util/systemtap/ChangeLog b/dev-util/systemtap/ChangeLog
index 9f70f11788b1..0637fac55ab9 100644
--- a/dev-util/systemtap/ChangeLog
+++ b/dev-util/systemtap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/systemtap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.40 2008/01/12 18:37:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.41 2008/01/19 21:07:42 swegener Exp $
+
+*systemtap-0.6.1_p20080119 (19 Jan 2008)
+
+  19 Jan 2008; Sven Wegener <swegener@gentoo.org>
+  +files/systemtap-20080119-grsecurity.patch,
+  -systemtap-0.6_p20071222.ebuild, +systemtap-0.6.1_p20080119.ebuild:
+  Version bump.
 
 *systemtap-0.6_p20080112 (12 Jan 2008)
 
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 0d7bdbbe6224..70c9ac781265 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX systemtap-20070414-grsecurity.patch 1294 RMD160 209186cbcd52e7a0a765540251362083875df003 SHA1 6c78ff47e93172957ba60fa59de529ddfdf77b93 SHA256 e2179e4b7c721ef0ff38df2f441bf49c075e92555112e98d64a4ad84001916a1
-MD5 80fd877b314ac56e9f75e603aceff638 files/systemtap-20070414-grsecurity.patch 1294
-RMD160 209186cbcd52e7a0a765540251362083875df003 files/systemtap-20070414-grsecurity.patch 1294
-SHA256 e2179e4b7c721ef0ff38df2f441bf49c075e92555112e98d64a4ad84001916a1 files/systemtap-20070414-grsecurity.patch 1294
-DIST systemtap-20071222.tar.bz2 778969 RMD160 a8ed45aa247081052a8de4d3b5651b9f2d5ea350 SHA1 9f2a1583d3b8889ebac365a2d490d6d825b441e5 SHA256 403c2aa0b8b554b6c4dd6c98a97b97e6435ea0f7fb2d0e8919fa2c510a5d7fe2
+AUX systemtap-20070414-grsecurity.patch 1168 RMD160 d406a321574b3ff1811eb8fba38be76d48736a3e SHA1 9746d13cc7cd83a53b1297f18847dfeb9c69d6df SHA256 f71ff5e2a2fd6aa882bc60d6b7ca19eb0ad4b1b46f5badcbb9d50b24f5b5fa26
+MD5 7edfbb62d79cb8508d4d3e53f325c9f2 files/systemtap-20070414-grsecurity.patch 1168
+RMD160 d406a321574b3ff1811eb8fba38be76d48736a3e files/systemtap-20070414-grsecurity.patch 1168
+SHA256 f71ff5e2a2fd6aa882bc60d6b7ca19eb0ad4b1b46f5badcbb9d50b24f5b5fa26 files/systemtap-20070414-grsecurity.patch 1168
+AUX systemtap-20080119-grsecurity.patch 1315 RMD160 0f94b5602d0026abec5c4ede2cefeb43a76f5ad7 SHA1 32a3cb2a69bae46a98df58fff4d9e3989f498e5c SHA256 b27e23eea34271f4ce7c1d6c3dd9d5757d6a870706fd3f39058636ed58238781
+MD5 ffb3d10eb9045e6d6f2a3ceff1d0e4b7 files/systemtap-20080119-grsecurity.patch 1315
+RMD160 0f94b5602d0026abec5c4ede2cefeb43a76f5ad7 files/systemtap-20080119-grsecurity.patch 1315
+SHA256 b27e23eea34271f4ce7c1d6c3dd9d5757d6a870706fd3f39058636ed58238781 files/systemtap-20080119-grsecurity.patch 1315
 DIST systemtap-20071229.tar.bz2 779795 RMD160 69344a6b91785269177e74bf5fcd0c3dc4a7dfb4 SHA1 ff7e633350cfa7c9e28f1c99d028b18cfbfd1629 SHA256 b8c2b53ecb6de8a3118bf5b21c669ea7f24c7724d4521186abd34060948470b1
 DIST systemtap-20080105.tar.bz2 779519 RMD160 b777cc1d8fecfba2f21befe2c618ead8156eb3c4 SHA1 319fc06b06692af47e0cfd9e8a62050ca4589265 SHA256 3e85009c7c22d319a6ce4d727c793fe14c77faa1766b6aec5acfedee81115ac8
 DIST systemtap-20080112.tar.bz2 779779 RMD160 83e68e0b12695f086e8a4b1d48abc1c4565354c0 SHA1 2f2ae17c5705cc7a2e60712a5503df31e628dfc5 SHA256 b59748a91bb0232f79434d11bc56a117eeb3bd0325b3e4edb98057ed19aa5f73
-EBUILD systemtap-0.6_p20071222.ebuild 1690 RMD160 cad2fc848d00f380243591541b8636c73db231c6 SHA1 43f9d70318930236807585b5e53099a6b04d7b2c SHA256 d643a39b35661a406c7b55878a3225ad8da1d1517ea30ebe8baca801c225e9bc
-MD5 1b2b2e258b1533b67c3a9cf0f2dbfc74 systemtap-0.6_p20071222.ebuild 1690
-RMD160 cad2fc848d00f380243591541b8636c73db231c6 systemtap-0.6_p20071222.ebuild 1690
-SHA256 d643a39b35661a406c7b55878a3225ad8da1d1517ea30ebe8baca801c225e9bc systemtap-0.6_p20071222.ebuild 1690
+DIST systemtap-20080119.tar.bz2 784436 RMD160 1d9523af013a54d0b81109e6650ffe72f0855cac SHA1 66b31a7a475f6d5c0a54ce714d7b355dae6ca62d SHA256 66921aae697f6e9d006da28da69bea35a3bcbd2f80c78597764c984e57fed753
+EBUILD systemtap-0.6.1_p20080119.ebuild 1692 RMD160 fd082fc4dacbac57bf2dd0a18ed795655d84b303 SHA1 7d05d84c5e7a01a53e386f0aa6f3e2f7ed760011 SHA256 537a7df6319679f3a6cb038799a62553c8615fe4b540f81a9583807d1a29d369
+MD5 40e70c192d9be416d2b746f2d3ef3c75 systemtap-0.6.1_p20080119.ebuild 1692
+RMD160 fd082fc4dacbac57bf2dd0a18ed795655d84b303 systemtap-0.6.1_p20080119.ebuild 1692
+SHA256 537a7df6319679f3a6cb038799a62553c8615fe4b540f81a9583807d1a29d369 systemtap-0.6.1_p20080119.ebuild 1692
 EBUILD systemtap-0.6_p20071229.ebuild 1690 RMD160 7829da4eab915ff3f1e3eb3433d7199f1cfd81df SHA1 c495a83a4034366f203a98c79d1c9572d2e0f869 SHA256 b59afdc0be5b29fb52f341ce9b5f0ad7c69b07ee3558dbefbffc1c77994aef4b
 MD5 25a8ce87bbde2aed37990269ec16d130 systemtap-0.6_p20071229.ebuild 1690
 RMD160 7829da4eab915ff3f1e3eb3433d7199f1cfd81df systemtap-0.6_p20071229.ebuild 1690
@@ -25,17 +29,17 @@ EBUILD systemtap-0.6_p20080112.ebuild 1690 RMD160 35a22051d2eff1a77891cde4dd904d
 MD5 fd3b9b67714878b3bf733605f33bd6be systemtap-0.6_p20080112.ebuild 1690
 RMD160 35a22051d2eff1a77891cde4dd904dfddc8a3930 systemtap-0.6_p20080112.ebuild 1690
 SHA256 463b3c51d98c0c7b024edc9b11c60d383e5492fc01ba7360525d5636f4c41e37 systemtap-0.6_p20080112.ebuild 1690
-MISC ChangeLog 6851 RMD160 15a78bd9d99238e3e1f3eaacf42cceb72b496343 SHA1 75b45a2bb02032feca25dbf42227f31d23e17121 SHA256 ab65aff3371d9632c3d2e4258e3ead71f5a76ea479c8ad978e5a417862d408e1
-MD5 d8d3abf7d487573020b26f9f2832c80b ChangeLog 6851
-RMD160 15a78bd9d99238e3e1f3eaacf42cceb72b496343 ChangeLog 6851
-SHA256 ab65aff3371d9632c3d2e4258e3ead71f5a76ea479c8ad978e5a417862d408e1 ChangeLog 6851
+MISC ChangeLog 7076 RMD160 4251be9a5423f99392137d4d51c24e7c3e494d34 SHA1 d6077f9a8f5d2a0de7224685f6490a1e9cc03abe SHA256 1f1e4ca2e11243642643da74b358e684a6f6a99e867a556cc223de486a7b27bb
+MD5 8783926ce0fad86c325d2ee6a7d42380 ChangeLog 7076
+RMD160 4251be9a5423f99392137d4d51c24e7c3e494d34 ChangeLog 7076
+SHA256 1f1e4ca2e11243642643da74b358e684a6f6a99e867a556cc223de486a7b27bb ChangeLog 7076
 MISC metadata.xml 224 RMD160 7f4383dcad66333b9ce8db59aa0d45bac5e95ef9 SHA1 6d56e5c988fe0c85370db92875086218349cea45 SHA256 707842fe6bed516e5865253fa613bb036ddfa66026dd163981627d4b90373a4f
 MD5 ad40c884c43300600c338439dc6102de metadata.xml 224
 RMD160 7f4383dcad66333b9ce8db59aa0d45bac5e95ef9 metadata.xml 224
 SHA256 707842fe6bed516e5865253fa613bb036ddfa66026dd163981627d4b90373a4f metadata.xml 224
-MD5 024525ae3e485332c5c316065695090c files/digest-systemtap-0.6_p20071222 259
-RMD160 61b58b99d1c279cd13c9ca50c16fd0eeaaadacf2 files/digest-systemtap-0.6_p20071222 259
-SHA256 8a1e20afdc92bf0da52df060517f0a7ad94e981d92e496b374537e257710463f files/digest-systemtap-0.6_p20071222 259
+MD5 d2a06066e3a873cf499fda78b34c0863 files/digest-systemtap-0.6.1_p20080119 259
+RMD160 fe6fd587387bf2d1c93aa45402b01d1e5599edbd files/digest-systemtap-0.6.1_p20080119 259
+SHA256 bc1ea76f13dd87827d25d4c10386bf3ef640a8b00690475303e1afe5f725707c files/digest-systemtap-0.6.1_p20080119 259
 MD5 6bdf5084e0ed2aa7a371bd30d46f0373 files/digest-systemtap-0.6_p20071229 259
 RMD160 816662255ffb1f4c39a47a5c3b35221fd528edfd files/digest-systemtap-0.6_p20071229 259
 SHA256 66c1c922f1cb080c910ebf37c4c5b3006f9dd5d721a02e2711cdcb93b6be19ad files/digest-systemtap-0.6_p20071229 259
@@ -48,7 +52,7 @@ SHA256 f7cbbf7a19d9ef544ac776d32507b6a4be648cf767e5c533f77c346ef473eb27 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHiQj5I1lqEGTUzyQRAn1iAKCis71/aRRqpPTWysbjPqn/ZmPFzwCgtnia
-qzacl1/LDkhIHtJljEfw4wI=
-=tYEI
+iD8DBQFHkmanI1lqEGTUzyQRAssBAKC7H71mTugdqiqq8NlB2C2nAWB+WwCeIFYX
+Sii51clqJfTnnLthwTzRNCk=
+=M5+Z
 -----END PGP SIGNATURE-----
diff --git a/dev-util/systemtap/files/digest-systemtap-0.6.1_p20080119 b/dev-util/systemtap/files/digest-systemtap-0.6.1_p20080119
new file mode 100644
index 000000000000..11650b3678fb
--- /dev/null
+++ b/dev-util/systemtap/files/digest-systemtap-0.6.1_p20080119
@@ -0,0 +1,3 @@
+MD5 722056c413998fc12d7e4e6cf653bf0d systemtap-20080119.tar.bz2 784436
+RMD160 1d9523af013a54d0b81109e6650ffe72f0855cac systemtap-20080119.tar.bz2 784436
+SHA256 66921aae697f6e9d006da28da69bea35a3bcbd2f80c78597764c984e57fed753 systemtap-20080119.tar.bz2 784436
diff --git a/dev-util/systemtap/files/digest-systemtap-0.6_p20071222 b/dev-util/systemtap/files/digest-systemtap-0.6_p20071222
deleted file mode 100644
index c7d8cae7e33e..000000000000
--- a/dev-util/systemtap/files/digest-systemtap-0.6_p20071222
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1444102aaa986e7257af421c9bbfb1ff systemtap-20071222.tar.bz2 778969
-RMD160 a8ed45aa247081052a8de4d3b5651b9f2d5ea350 systemtap-20071222.tar.bz2 778969
-SHA256 403c2aa0b8b554b6c4dd6c98a97b97e6435ea0f7fb2d0e8919fa2c510a5d7fe2 systemtap-20071222.tar.bz2 778969
diff --git a/dev-util/systemtap/files/systemtap-20070414-grsecurity.patch b/dev-util/systemtap/files/systemtap-20070414-grsecurity.patch
index 82925bedb58d..257c8c743013 100644
--- a/dev-util/systemtap/files/systemtap-20070414-grsecurity.patch
+++ b/dev-util/systemtap/files/systemtap-20070414-grsecurity.patch
@@ -1,6 +1,5 @@
-diff -Nur src.old/translate.cxx src/translate.cxx
---- src.old/translate.cxx	2007-04-04 18:41:27.000000000 +0000
-+++ src/translate.cxx	2007-04-16 18:18:25.302079239 +0000
+--- src/translate.cxx
++++ src/translate.cxx
 @@ -1131,11 +1131,17 @@
                 << ", probes: " << session->probes.size()
                 << "\\n\""
diff --git a/dev-util/systemtap/files/systemtap-20080119-grsecurity.patch b/dev-util/systemtap/files/systemtap-20080119-grsecurity.patch
new file mode 100644
index 000000000000..a558647951db
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-20080119-grsecurity.patch
@@ -0,0 +1,34 @@
+--- src/runtime/print.c
++++ src/runtime/print.c
+@@ -281,9 +281,15 @@
+ 	printk(KERN_DEBUG "%s: systemtap: %s, base: %p, memory: %lu+%lu+%u+%u+%u data+text+ctx+net+alloc, probes: %d\n",
+ 	       THIS_MODULE->name,
+ 	       vstr, 
++#ifdef HAVE_GRSECURITY
++	       THIS_MODULE->module_core_rx,
++	       (unsigned long) THIS_MODULE->core_size_rw,
++               (unsigned long) THIS_MODULE->core_size_rx,
++#else
+ 	       THIS_MODULE->module_core,  
+ 	       (unsigned long) (THIS_MODULE->core_size - THIS_MODULE->core_text_size),
+                (unsigned long) THIS_MODULE->core_text_size,
++#endif
+ 	       ctx,
+ 	       _stp_allocated_net_memory,
+ 	       _stp_allocated_memory - _stp_allocated_net_memory,
+@@ -292,9 +298,15 @@
+ 	printk(KERN_DEBUG "%s: systemtap: %s, base: %p, memory: %lu+%lu+%u+%u data+text+ctx+net, probes: %d\n",
+ 	       THIS_MODULE->name,
+ 	       vstr, 
++#ifdef HAVE_GRSECURITY
++	       THIS_MODULE->module_core_rx,
++	       (unsigned long) THIS_MODULE->core_size_rw,
++               (unsigned long) THIS_MODULE->core_size_rx,
++#else
+ 	       THIS_MODULE->module_core,  
+ 	       (unsigned long) (THIS_MODULE->core_size - THIS_MODULE->core_text_size),
+                (unsigned long) THIS_MODULE->core_text_size,
++#endif
+ 	       ctx,
+ 	       _stp_allocated_net_memory,
+ 	       num_probes);
diff --git a/dev-util/systemtap/systemtap-0.6_p20071222.ebuild b/dev-util/systemtap/systemtap-0.6.1_p20080119.ebuild
index d719c486927c..be15e8b74d6c 100644
--- a/dev-util/systemtap/systemtap-0.6_p20071222.ebuild
+++ b/dev-util/systemtap/systemtap-0.6.1_p20080119.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.6_p20071222.ebuild,v 1.1 2008/01/01 13:42:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.6.1_p20080119.ebuild,v 1.1 2008/01/19 21:07:42 swegener Exp $
 
 inherit linux-info eutils
 
@@ -35,7 +35,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/systemtap-20070414-grsecurity.patch
+	epatch "${FILESDIR}"/systemtap-20080119-grsecurity.patch
 }
 
 src_install() {