Fix user creation for bug #193656

Package-Manager: portage-2.1.4_rc7

5 files changed, 52 insertions, 20 deletions

diff --git a/net-analyzer/prewikka/ChangeLog b/net-analyzer/prewikka/ChangeLog
index a2f5b911cf0d..38f3bb9e29da 100644
--- a/net-analyzer/prewikka/ChangeLog
+++ b/net-analyzer/prewikka/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/prewikka
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prewikka/ChangeLog,v 1.24 2007/09/05 17:59:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prewikka/ChangeLog,v 1.25 2007/12/05 22:16:48 jokey Exp $
+
+*prewikka-0.9.12.1-r1 (05 Dec 2007)
+
+  05 Dec 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/prewikka-0.9.12.1-create-user.patch, -prewikka-0.9.12.1.ebuild,
+  +prewikka-0.9.12.1-r1.ebuild:
+  Fix user creation for bug #193656
 
 *prewikka-0.9.12.1 (05 Sep 2007)
 
diff --git a/net-analyzer/prewikka/Manifest b/net-analyzer/prewikka/Manifest
index 4e1dde4be4a6..39ac6d9a0bd9 100644
--- a/net-analyzer/prewikka/Manifest
+++ b/net-analyzer/prewikka/Manifest
@@ -1,38 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX prewikka-0.9.12.1-create-user.patch 613 RMD160 c8c91223982940af0417d6632f447928781abc76 SHA1 4885bd8d4058390ba108690aab43e7529d8a9baa SHA256 8dcc9361f9744176b819cfc0453653ad680b8368e9e63d729889c6406659d3d5
+MD5 3169b3ba7b3f92e47b9e35fe2b55d589 files/prewikka-0.9.12.1-create-user.patch 613
+RMD160 c8c91223982940af0417d6632f447928781abc76 files/prewikka-0.9.12.1-create-user.patch 613
+SHA256 8dcc9361f9744176b819cfc0453653ad680b8368e9e63d729889c6406659d3d5 files/prewikka-0.9.12.1-create-user.patch 613
 AUX prewikka.conf-sample 666 RMD160 a9e15944057a9056cb6cfb7f8e8753856635060d SHA1 d21137a9435bb2ee00e280547b0e9aea3b6bb2ea SHA256 41b0c60c9699d8dd6dd8c000c209628345d1ab518866a31720ed431cb3699536
 MD5 1c302c9082fc295a8308b1d492d00d3c files/prewikka.conf-sample 666
 RMD160 a9e15944057a9056cb6cfb7f8e8753856635060d files/prewikka.conf-sample 666
 SHA256 41b0c60c9699d8dd6dd8c000c209628345d1ab518866a31720ed431cb3699536 files/prewikka.conf-sample 666
 DIST prewikka-0.9.12.1.tar.gz 238691 RMD160 eb53b4f838233dd402627b00da29935c6adbcf8c SHA1 1438c3ac777e8a70459df9cd96147130c6dd3c94 SHA256 41d95e6bc485d3273b98ca4cbb53187e3dbc20e5b0a6447394e244a9b007854d
 DIST prewikka-0.9.3.tar.gz 149503 RMD160 177d29089354b7bfad120521868663505375799e SHA1 bdc7db4145ba554d8cc834480ebcf26426da276d SHA256 5408bd9520c51bf08a6ef9b721323dbc049495905ba1a50fe64fe7588b54bdfc
-EBUILD prewikka-0.9.12.1.ebuild 1136 RMD160 20b3339f3ed22ef39db0da955f6cfe05bcc13a6e SHA1 0e6dd02cc01cf2460393b2d4495ca4e37372d389 SHA256 ea3c529f028b6bd79b9c86dbce62e8858a76a4ba7ec15984b8a27e6ffa267a6a
-MD5 1886ccfd1299ebed7682bfce722b2900 prewikka-0.9.12.1.ebuild 1136
-RMD160 20b3339f3ed22ef39db0da955f6cfe05bcc13a6e prewikka-0.9.12.1.ebuild 1136
-SHA256 ea3c529f028b6bd79b9c86dbce62e8858a76a4ba7ec15984b8a27e6ffa267a6a prewikka-0.9.12.1.ebuild 1136
+EBUILD prewikka-0.9.12.1-r1.ebuild 1226 RMD160 f8b6a2bc7fd096249f35904510ca4878a02097e2 SHA1 e2d40228f1272ad124d5dddf610037e73b95e425 SHA256 33bcd1d406d70695af83e5f38056e39c71883084c7911465ccc21d65ef4e9545
+MD5 3adf3df3917364e24af6e76f5f75f750 prewikka-0.9.12.1-r1.ebuild 1226
+RMD160 f8b6a2bc7fd096249f35904510ca4878a02097e2 prewikka-0.9.12.1-r1.ebuild 1226
+SHA256 33bcd1d406d70695af83e5f38056e39c71883084c7911465ccc21d65ef4e9545 prewikka-0.9.12.1-r1.ebuild 1226
 EBUILD prewikka-0.9.3.ebuild 944 RMD160 01c3b48a8cdaedcf6ee25a0f08b11b7032268424 SHA1 4d2aac416de0c45c34977e4e6c51592a2fac1ecb SHA256 c85d0bbd235360edf1066bc7d7dfeef8342601f666fb48e7caea7f4c207532ed
 MD5 338f8a33c72dbb1ad99c755e8d5ce904 prewikka-0.9.3.ebuild 944
 RMD160 01c3b48a8cdaedcf6ee25a0f08b11b7032268424 prewikka-0.9.3.ebuild 944
 SHA256 c85d0bbd235360edf1066bc7d7dfeef8342601f666fb48e7caea7f4c207532ed prewikka-0.9.3.ebuild 944
-MISC ChangeLog 4061 RMD160 e51e4ec36424d46825a2d03970e40dd852efb50b SHA1 37a55cdbce6a921e1ebc4dc9b3e6d1811a33167a SHA256 3e43073e017f4501ef303bb10db7f3999e58ae6deb8234a8b0ae266d37224b6d
-MD5 1dae4dcfcbf7a796b2e9e3ff5f5c39f8 ChangeLog 4061
-RMD160 e51e4ec36424d46825a2d03970e40dd852efb50b ChangeLog 4061
-SHA256 3e43073e017f4501ef303bb10db7f3999e58ae6deb8234a8b0ae266d37224b6d ChangeLog 4061
+MISC ChangeLog 4289 RMD160 7be28aad496df094792c335479cc08ab7574788d SHA1 b12cd1f0f278eb36986139386cb54b3d70a5dab3 SHA256 96c341dd163800f2f1a144ef9cb3b2dd7a854f07d3dd4e17c73a0fbdf0a24417
+MD5 53c50d1baea3f6f86b0579b961dc4a49 ChangeLog 4289
+RMD160 7be28aad496df094792c335479cc08ab7574788d ChangeLog 4289
+SHA256 96c341dd163800f2f1a144ef9cb3b2dd7a854f07d3dd4e17c73a0fbdf0a24417 ChangeLog 4289
 MISC metadata.xml 216 RMD160 f6f38b1a6238a2df37293ba96e44190dcd5377eb SHA1 962936774e8abaca0262753da621dd1ea6042dbf SHA256 80c7ac1760311ae5c271e7e53bdd563e96b957c223d3a8a1455efdbe89b86970
 MD5 4fbb6885cc73a96f82855db5b77a7fd6 metadata.xml 216
 RMD160 f6f38b1a6238a2df37293ba96e44190dcd5377eb metadata.xml 216
 SHA256 80c7ac1760311ae5c271e7e53bdd563e96b957c223d3a8a1455efdbe89b86970 metadata.xml 216
-MD5 1ea5b20f754c5be56316feb1e9f3d91d files/digest-prewikka-0.9.12.1 253
-RMD160 f60f111632d54e45bd43d80c1ed0cd1bc707df0a files/digest-prewikka-0.9.12.1 253
-SHA256 a47460c454f1f59486fa64d864b0ab11d9a112a778bb5b394a7df94f29034804 files/digest-prewikka-0.9.12.1 253
+MD5 1ea5b20f754c5be56316feb1e9f3d91d files/digest-prewikka-0.9.12.1-r1 253
+RMD160 f60f111632d54e45bd43d80c1ed0cd1bc707df0a files/digest-prewikka-0.9.12.1-r1 253
+SHA256 a47460c454f1f59486fa64d864b0ab11d9a112a778bb5b394a7df94f29034804 files/digest-prewikka-0.9.12.1-r1 253
 MD5 2ef1113265e590280a45c65034eb7e5e files/digest-prewikka-0.9.3 244
 RMD160 b939ab8e4114edf4e22265bfaa494b66827e5880 files/digest-prewikka-0.9.3 244
 SHA256 c58115b540267faa87caa926c63be76756f769a8adf403381ac008daf982a16a files/digest-prewikka-0.9.3 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG3u5yz974XjDVpbkRArIbAJ9PvQcNoquichIjFEAMl2rnxttWmwCfSPN9
-vr0HjtmApjVZf4d7nJsyA+4=
-=Zlr3
+iD8DBQFHVyNcz974XjDVpbkRAhp0AKDGcDCBMwXU9MDg98ZzXU19PCMxygCeLwl/
+WRqhyGmYLHuJ+NJw0oumpy0=
+=oKXZ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/prewikka/files/digest-prewikka-0.9.12.1 b/net-analyzer/prewikka/files/digest-prewikka-0.9.12.1-r1
index e5ffb48bed62..e5ffb48bed62 100644
--- a/net-analyzer/prewikka/files/digest-prewikka-0.9.12.1
+++ b/net-analyzer/prewikka/files/digest-prewikka-0.9.12.1-r1
diff --git a/net-analyzer/prewikka/files/prewikka-0.9.12.1-create-user.patch b/net-analyzer/prewikka/files/prewikka-0.9.12.1-create-user.patch
new file mode 100644
index 000000000000..368b93d6ee5f
--- /dev/null
+++ b/net-analyzer/prewikka/files/prewikka-0.9.12.1-create-user.patch
@@ -0,0 +1,17 @@
+--- prewikka-0.9.12.1.orig/prewikka/templates/UserSettings.tmpl	2007-09-24 10:55:39.000000000 -0400
++++ prewikka-0.9.12.1/prewikka/templates/UserSettings.tmpl	2007-09-24 10:56:03.000000000 -0400
+@@ -7,13 +7,12 @@
+ 
+ <form action="?" method="post">
+ #if $user.login
++<input type="hidden" name="login" value="$user.login"/>
+ <input type="hidden" name="view" value="user_settings_modify"/>
+ #else
+ <input type="hidden" name="view" value="user_settings_add"/>
+ #end if
+ 
+-<input type="hidden" name="login" value="$user.login"/>
+-
+ #if $user.origin
+ <input type="hidden" name="origin" value="$user.origin" />
+ #end if
diff --git a/net-analyzer/prewikka/prewikka-0.9.12.1.ebuild b/net-analyzer/prewikka/prewikka-0.9.12.1-r1.ebuild
index 7eb110f65d2c..aaeccb064e1f 100644
--- a/net-analyzer/prewikka/prewikka-0.9.12.1.ebuild
+++ b/net-analyzer/prewikka/prewikka-0.9.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prewikka/prewikka-0.9.12.1.ebuild,v 1.1 2007/09/05 17:59:05 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prewikka/prewikka-0.9.12.1-r1.ebuild,v 1.1 2007/12/05 22:16:48 jokey Exp $
 
 inherit distutils
 
@@ -20,18 +20,22 @@ DEPEND=">=dev-lang/python-2.3
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if ! built_with_use dev-libs/libprelude python ;
-	then
+	if ! built_with_use dev-libs/libprelude python ; then
 		die 'requires dev-libs/libprelude to be built with "python" use flag'
 	fi
+}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-create-user.patch
 }
 
 src_install() {
 	distutils_src_install
 	dodir /etc/prewikka
 	insinto /etc/prewikka
-	doins ${FILESDIR}/prewikka.conf-sample
+	doins "${FILESDIR}"/prewikka.conf-sample
 	rm "${D}"/\-dist
 }