(non maintainer commit) Remove old, -r1 will not work on amd64, add amd64 patch to -r2, bug #247536

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27.10 x86_64

5 files changed, 222 insertions, 23 deletions

diff --git a/app-admin/sxid/ChangeLog b/app-admin/sxid/ChangeLog
index bc969dd75cfd..00e198d6a1f9 100644
--- a/app-admin/sxid/ChangeLog
+++ b/app-admin/sxid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/sxid
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sxid/ChangeLog,v 1.22 2008/10/23 02:25:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sxid/ChangeLog,v 1.23 2008/12/31 03:42:12 darkside Exp $
+
+*sxid-4.0.4-r2 (31 Dec 2008)
+
+  31 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/sxid-64bit-clean.patch, -sxid-4.0.4.ebuild, sxid-4.0.4-r1.ebuild,
+  +sxid-4.0.4-r2.ebuild:
+  (non maintainer commit) Remove old, -r1 will not work on amd64, add amd64
+  patch to -r2, bug #247536
 
   23 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> sxid-4.0.4-r1.ebuild:
   Respect CC.
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
index 3a8a57bc982a..1e4510e42e69 100644
--- a/app-admin/sxid/Manifest
+++ b/app-admin/sxid/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX sxid-64bit-clean.patch 5354 RMD160 b5482c07f0dc65306a0861b0dbf875bc28c9f1d2 SHA1 5b1a066594e64f12d703dfeb4c22f03335896723 SHA256 2365316a1cee4bc2c2aca897f2589a15056fabc3401f213181bd72e22a24a2e9
 DIST sxid_4.0.4.tar.gz 45277 RMD160 6e3bfeed85b51425ead6a5dd05c3bde2d8e0b179 SHA1 b0096e41b66acd72c4c8e145aa20002425f731dd SHA256 a6d9b7e22efc5b9e3c08a363b45dec1bfb812a65e389542306d1a29a8e21d654
-EBUILD sxid-4.0.4-r1.ebuild 1068 RMD160 39a9d0a1f6b917fbfa0f1a1f72277df435fc52a4 SHA1 c35228e4e2766308d8b12eede22a5021a7b6128a SHA256 eb0838a896b6eeef1d9c63d3c4bf3dd591fba7ef3a0c1748a1174d7c0e27b64e
-EBUILD sxid-4.0.4.ebuild 1007 RMD160 d3032ecbc5ef5d0174f8d1379fe557cf42cbe727 SHA1 4579294d2cb115a41a0ad099331f47385d46fc17 SHA256 75476815c524ee2f7a974867c1a945625e96863154770f032214bd8ca8e7f357
-MISC ChangeLog 2482 RMD160 cca6e8adb8fa03a07b0c1fed72796a12e8ae069f SHA1 ea392f655320b82fca595cb1a03e2addc06bf06d SHA256 1919deeea2a9159687232d9e0cb96cd9855c15e0bb27a6f88436e5ea0497a61a
+EBUILD sxid-4.0.4-r1.ebuild 1070 RMD160 d808b8b476505657bbf52677183191de3f71bdf0 SHA1 47fad135ed464c141c87ad3130a605eefe7f1595 SHA256 3840d4f984abdb92997720edef48bb0700caca84b32c8c3eda2d8931ba373578
+EBUILD sxid-4.0.4-r2.ebuild 1106 RMD160 2bba46906d2e35b6ac99d9b46c69936c0701c105 SHA1 25ad0702639c22bae64bb314fc02b0b4c3e7d538 SHA256 d8cb42b881cd1899536c50b27d7abee791b8a89863b6a88804ef412e39f452cc
+MISC ChangeLog 2766 RMD160 8b8822c0868d8bc067b9fb3fb27defc54839a605 SHA1 b3d2d93bf893942bda07efbc18367275cf1bd747 SHA256 6786be1f17a544c0910e1b2c35b4f93db8224b3dd18981cbf64422e0d422aaf7
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkj/4KUACgkQAiZjviIA2XhlfACg7KRiAyT6r2ynV3CXnjq478ba
-8n8AoMXTMKKOleKYIqPJL+B2S39CbQNo
-=PsF9
------END PGP SIGNATURE-----
diff --git a/app-admin/sxid/files/sxid-64bit-clean.patch b/app-admin/sxid/files/sxid-64bit-clean.patch
new file mode 100644
index 000000000000..6aa53ac7a78f
--- /dev/null
+++ b/app-admin/sxid/files/sxid-64bit-clean.patch
@@ -0,0 +1,195 @@
+diff -c1 -r sxid-4.0.5.orig/source/md5.c sxid-4.0.5/source/md5.c
+*** sxid-4.0.5.orig/source/md5.c	1998-12-30 13:35:04.000000000 -0500
+--- sxid-4.0.5/source/md5.c	2007-03-23 11:58:40.000000000 -0400
+***************
+*** 17,18 ****
+--- 17,27 ----
+  
++ /*
++  * This code contains adaptations of changes made in 1997 by
++  * Jim Kingdon of Cyclic Software so as not to require an integer
++  * type that is exactly 32 bits wide.  Jim Kingdon's changes
++  * were explicitly released to the public domain.  The adaptations
++  * were made by Ari Johnson in 2007 and are also hereby released
++  * into the public domain.
++  */
++ 
+  #include <string.h>		/* for memcpy() */
+***************
+*** 20,44 ****
+  
+! #ifndef HIGHFIRST
+! #define byteReverse(buf, len)	/* Nothing */
+! #else
+! void byteReverse (unsigned char *buf, unsigned longs);
+! 
+! #ifndef ASM_MD5
+! /*
+!  * Note: this code is harmless on little-endian machines.
+!  */
+! void byteReverse (unsigned char *buf, unsigned longs)
+! {
+!     uint32 t;
+  
+!     do {
+! 	t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+! 	    ((unsigned) buf[1] << 8 | buf[0]);
+! 	*(uint32 *) buf = t;
+! 	buf += 4;
+!     }
+!     while (--longs);
+  }
+- #endif
+- #endif
+  
+--- 29,47 ----
+  
+! /* Little-endian byte-swapping routines.  Note that these do not
+!    depend on the size of datatypes such as uint32, nor do they require
+!    us to detect the endianness of the machine we are running on. */
+! 
+! static uint32
+! getu32 (const unsigned char *addr) {
+!     return (((((unsigned long)addr[3] << 8) | addr[2]) << 8)
+! 		| addr[1]) << 8 | addr[0];
+! }
+  
+! static void
+! putu32 (uint32 data, unsigned char *addr) {
+!     addr[0] = (unsigned char) data;
+!     addr[1] = (unsigned char) (data >> 8);
+!     addr[2] = (unsigned char) (data >> 16);
+!     addr[3] = (unsigned char) (data >> 24);
+  }
+  
+***************
+*** 70,72 ****
+      t = ctx->bits[0];
+!     if ((ctx->bits[0] = t + ((uint32) len << 3)) < t)
+  	ctx->bits[1]++;		/* Carry from low to high */
+--- 73,75 ----
+      t = ctx->bits[0];
+!     if ((ctx->bits[0] = (t + ((uint32) len << 3)) & 0xffffffff) < t)
+  	ctx->bits[1]++;		/* Carry from low to high */
+***************
+*** 79,81 ****
+      if (t) {
+! 	unsigned char *p = (unsigned char *) ctx->in + t;
+  
+--- 82,84 ----
+      if (t) {
+! 	unsigned char *p = ctx->in + t;
+  
+***************
+*** 87,90 ****
+  	memcpy (p, buf, t);
+! 	byteReverse (ctx->in, 16);
+! 	MD5Transform (ctx->buf, (uint32 *) ctx->in);
+  	buf += t;
+--- 90,92 ----
+  	memcpy (p, buf, t);
+! 	MD5Transform (ctx->buf, ctx->in);
+  	buf += t;
+***************
+*** 96,99 ****
+  	memcpy (ctx->in, buf, 64);
+! 	byteReverse (ctx->in, 16);
+! 	MD5Transform (ctx->buf, (uint32 *) ctx->in);
+  	buf += 64;
+--- 98,100 ----
+  	memcpy (ctx->in, buf, 64);
+! 	MD5Transform (ctx->buf, ctx->in);
+  	buf += 64;
+***************
+*** 131,134 ****
+  	memset (p, 0, count);
+! 	byteReverse (ctx->in, 16);
+! 	MD5Transform (ctx->buf, (uint32 *) ctx->in);
+  
+--- 132,134 ----
+  	memset (p, 0, count);
+! 	MD5Transform (ctx->buf, ctx->in);
+  
+***************
+*** 140,150 ****
+      }
+-     byteReverse (ctx->in, 14);
+  
+      /* Append length in bits and transform */
+!     ((uint32 *) ctx->in)[14] = ctx->bits[0];
+!     ((uint32 *) ctx->in)[15] = ctx->bits[1];
+  
+!     MD5Transform (ctx->buf, (uint32 *) ctx->in);
+!     byteReverse ((unsigned char *) ctx->buf, 4);
+!     memcpy (digest, ctx->buf, 16);
+      memset ((char *) ctx, 0, sizeof (ctx));	/* In case it's sensitive */
+--- 140,151 ----
+      }
+  
+      /* Append length in bits and transform */
+!     putu32(ctx->bits[0], ctx->in + 56);
+!     putu32(ctx->bits[1], ctx->in + 60);
+  
+!     MD5Transform (ctx->buf, ctx->in);
+!     putu32(ctx->buf[0], digest);
+!     putu32(ctx->buf[1], digest + 4);
+!     putu32(ctx->buf[2], digest + 8);
+!     putu32(ctx->buf[3], digest + 12);
+      memset ((char *) ctx, 0, sizeof (ctx));	/* In case it's sensitive */
+***************
+*** 164,166 ****
+  #define MD5STEP(f, w, x, y, z, data, s) \
+! 	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+  
+--- 165,167 ----
+  #define MD5STEP(f, w, x, y, z, data, s) \
+! 	( w += f(x, y, z) + data, w &= 0xffffffff, w = w<<s | w>>(32-s), w += x )
+  
+***************
+*** 171,175 ****
+   */
+! void MD5Transform (uint32 buf[4], uint32 const in[16])
+  {
+      register uint32 a, b, c, d;
+  
+--- 172,181 ----
+   */
+! void MD5Transform (uint32 buf[4], const unsigned char inraw[64])
+  {
+      register uint32 a, b, c, d;
++     uint32 in[16];
++     int i;
++ 
++     for (i = 0; i < 16; ++i)
++ 	in[i] = getu32 (inraw + 4 * i);
+  
+diff -c1 -r sxid-4.0.5.orig/source/md5.h sxid-4.0.5/source/md5.h
+*** sxid-4.0.5.orig/source/md5.h	1998-12-30 13:35:04.000000000 -0500
+--- sxid-4.0.5/source/md5.h	2007-03-23 11:47:25.000000000 -0400
+***************
+*** 4,13 ****
+  
+- #ifdef __alpha
+- typedef unsigned int uint32;
+- 
+- #else
+  typedef unsigned long uint32;
+  
+- #endif
+- 
+  struct MD5Context {
+--- 4,7 ----
+***************
+*** 22,29 ****
+  void MD5Final (unsigned char digest[16], struct MD5Context *context);
+! void MD5Transform (uint32 buf[4], uint32 const in[16]);
+! 
+! /*
+!  * This is needed to make RSAREF happy on some MS-DOS compilers.
+!  */
+! typedef struct MD5Context MD5_CTX;
+  
+--- 16,18 ----
+  void MD5Final (unsigned char digest[16], struct MD5Context *context);
+! void MD5Transform (uint32 buf[4], const unsigned char in[64]);
+  
diff --git a/app-admin/sxid/sxid-4.0.4-r1.ebuild b/app-admin/sxid/sxid-4.0.4-r1.ebuild
index 65a8b7b1961c..d773c6055119 100644
--- a/app-admin/sxid/sxid-4.0.4-r1.ebuild
+++ b/app-admin/sxid/sxid-4.0.4-r1.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/app-admin/sxid/sxid-4.0.4-r1.ebuild,v 1.9 2008/10/23 02:25:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sxid/sxid-4.0.4-r1.ebuild,v 1.10 2008/12/31 03:42:12 darkside Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://freshmeat.net/projects/sxid"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="-amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc
@@ -33,7 +33,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc README docs/sxid.conf.example docs/sxid.cron.example
 }
 
diff --git a/app-admin/sxid/sxid-4.0.4.ebuild b/app-admin/sxid/sxid-4.0.4-r2.ebuild
index 0aab57aebada..a6e557e07e21 100644
--- a/app-admin/sxid/sxid-4.0.4.ebuild
+++ b/app-admin/sxid/sxid-4.0.4-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sxid/sxid-4.0.4.ebuild,v 1.9 2007/01/24 15:00:36 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sxid/sxid-4.0.4-r2.ebuild,v 1.1 2008/12/31 03:42:12 darkside Exp $
+
+inherit base toolchain-funcs
 
 DESCRIPTION="suid, sgid file and directory checking"
 SRC_URI="http://www.phunnypharm.org/pub/sxid/${P/-/_}.tar.gz"
@@ -8,16 +10,18 @@ HOMEPAGE="http://freshmeat.net/projects/sxid"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="virtual/libc
-	virtual/mta"
+		virtual/mailx"
 DEPEND="virtual/libc
 	sys-apps/sed
 	sys-devel/gcc
 	sys-devel/autoconf"
 
+PATCHES=( "${FILESDIR}/${PN}-64bit-clean.patch" )
+
 src_compile() {
 	# this is an admin application and really requires root to run correctly
 	# we need to move the binary to the sbin directory
@@ -25,12 +29,13 @@ src_compile() {
 	sed -i s/bindir/sbindir/g Makefile.in
 	cd ..
 
-	econf || die "econf failed"
+	tc-export CC
+	econf
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc README docs/sxid.conf.example docs/sxid.cron.example
 }