RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   25-Jul-2007 19:02:35
  Branch: HEAD                             Handle: 2007072518023400

  Modified files:
    rpm                     CHANGES
    rpm/lib                 psm.c rpmal.c rpmfi.c

  Log:
    - rip deep ia64 emulated triarch multilib hacks. worth millions to
    vendor, not me.

  Summary:
    Revision    Changes     Path
    1.1522      +1  -0      rpm/CHANGES
    2.213       +0  -33     rpm/lib/psm.c
    2.60        +1  -10     rpm/lib/rpmal.c
    2.70        +0  -14     rpm/lib/rpmfi.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1521 -r1.1522 CHANGES
  --- rpm/CHANGES	25 Jul 2007 16:56:07 -0000	1.1521
  +++ rpm/CHANGES	25 Jul 2007 17:02:34 -0000	1.1522
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: rip deep ia64 emulated triarch multilib hacks. worth millions to vendor, not me.
       - jbj: rip Depends index and dependency result caching.
       - rse: ported to DragonFly BSD (1.8.1)
       - rse: add the necessary Autoconf glue for using the ancient (and nowadays resurrected by POSIX) insque(3)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.212 -r2.213 psm.c
  --- rpm/lib/psm.c	22 Jul 2007 01:15:03 -0000	2.212
  +++ rpm/lib/psm.c	25 Jul 2007 17:02:34 -0000	2.213
  @@ -678,39 +678,6 @@
   		? 1 : 0);
       }
   
  -#if __ia64__
  -    /* XXX This assumes that all interpreters are elf executables. */
  -    if ((a != NULL && a[0] == 'i' && a[1] != '\0' && a[2] == '8' && a[3] == '6')
  -     && strcmp(argv[0], "/sbin/ldconfig"))
  -    {
  -	const char * fmt = rpmGetPath("%{?_autorelocate_path}", NULL);
  -	const char * errstr;
  -	char * newPath;
  -	char * t;
  -
  -	newPath = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr);
  -	fmt = _free(fmt);
  -
  -	/* XXX On ia64, change leading /emul/ix86 -> /emul/ia32, ick. */
  - 	if (newPath != NULL && *newPath != '\0'
  -	 && strlen(newPath) >= (sizeof("/emul/i386")-1)
  -	 && newPath[0] == '/' && newPath[1] == 'e' && newPath[2] == 'm'
  -	 && newPath[3] == 'u' && newPath[4] == 'l' && newPath[5] == '/'
  -	 && newPath[6] == 'i' && newPath[8] == '8' && newPath[9] == '6')
  - 	{
  -	    newPath[7] = 'a';
  -	    newPath[8] = '3';
  -	    newPath[9] = '2';
  -	}
  -
  -	t = alloca(strlen(newPath) + strlen(argv[0]) + 1);
  -	*t = '\0';
  -	(void) stpcpy( stpcpy(t, newPath), argv[0]);
  -	newPath = _free(newPath);
  -	argv[0] = t;
  -    }
  -#endif
  -
       if (hge(h, RPMTAG_INSTPREFIXES, &ipt, &prefixes, &numPrefixes)) {
   	freePrefixes = 1;
       } else if (hge(h, RPMTAG_INSTALLPREFIX, NULL, &oldPrefix, NULL)) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmal.c
  ============================================================================
  $ cvs diff -u -r2.59 -r2.60 rpmal.c
  --- rpm/lib/rpmal.c	16 Jul 2007 01:32:28 -0000	2.59
  +++ rpm/lib/rpmal.c	25 Jul 2007 17:02:34 -0000	2.60
  @@ -509,16 +509,7 @@
   	    (void) rpmfiSetDX(fi, dx);
   
   	    /*@-assignexpose -dependenttrans -observertrans@*/
  -	    {   DN = rpmfiDN(fi);
  -
  -#if defined(__ia64__)
  -/* XXX Make sure that autorelocated file dependencies are satisfied. */
  -#define	DNPREFIX	"/emul/ia32-linux"
  -		if (!strncmp(DN, DNPREFIX, sizeof(DNPREFIX)-1))
  -		    DN += sizeof(DNPREFIX)-1;
  -#endif
  -		dieNeedle->dirName = DN;
  -	    }
  +	    dieNeedle->dirName = rpmfiDN(fi);
   	    /*@=assignexpose =dependenttrans =observertrans@*/
   
   	    dieNeedle->dirNameLen = (dieNeedle->dirName != NULL
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfi.c
  ============================================================================
  $ cvs diff -u -r2.69 -r2.70 rpmfi.c
  --- rpm/lib/rpmfi.c	17 Jul 2007 14:39:31 -0000	2.69
  +++ rpm/lib/rpmfi.c	25 Jul 2007 17:02:34 -0000	2.70
  @@ -1458,20 +1458,6 @@
   	newPath = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr);
   	fmt = _free(fmt);
   
  -#if __ia64__
  -	/* XXX On ia64, change leading /emul/ix86 -> /emul/ia32, ick. */
  - 	if (newPath != NULL && *newPath != '\0'
  -	 && strlen(newPath) >= (sizeof("/emul/i386")-1)
  -	 && newPath[0] == '/' && newPath[1] == 'e' && newPath[2] == 'm'
  -	 && newPath[3] == 'u' && newPath[4] == 'l' && newPath[5] == '/'
  -	 && newPath[6] == 'i' && newPath[8] == '8' && newPath[9] == '6')
  - 	{
  -	    newPath[7] = 'a';
  -	    newPath[8] = '3';
  -	    newPath[9] = '2';
  -	}
  -#endif
  - 
   	/* XXX Make sure autoreloc is not already specified. */
   	i = p->nrelocs;
   	if (newPath != NULL && *newPath != '\0' && p->relocs != NULL)
  @@ .