--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

I have a Debian GNU/Linux system, on which I use pkgsrc via
othersrc/boostrap-pkgsrc.  For the basic linux system only installed the
absolute bare minimum, and now I'm in the process of installing packages
via pkgsrc.  Yay. :)

Attached are patches that were necessary for me to install pax from
pkgtools/pkgsrc.  In addition, I had to copy over
/usr/share/groff/tmac.andoc/* from a NetBSD machine.

Note that pax is installed in /bin/pax, but /usr/pkgsrc/mk/defs.Linux.mk
sets it to ${ZOULARISBASE}/bin/pax -- this needs tweaking, obviously.

-Jan

-- 
Except most of the good bits were about frogs, I remember that.
You would not believe some of the things about frogs.

--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pax.linux.diff"

? a.out
? patches/patch-ac
? patches/patch-ad
? patches/patch-ae
? patches/patch-af
? patches/patch-ag
? patches/patch-ah
? patches/patch-ai
? patches/patch-aj
? patches/patch-ak
? patches/patch-al
? patches/patch-am
? patches/patch-ao
? patches/patch-ap
? patches/patch-aq
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pax/distinfo,v
retrieving revision 1.1
diff -b -u -r1.1 distinfo
--- distinfo	2001/04/17 12:19:48	1.1
+++ distinfo	2002/08/21 19:05:11
@@ -2,5 +2,19 @@
 
 SHA1 (pax-19980903.tar.gz) = dbbc6672b86ec4d371cda997bf40e64aa6cab0d1
 Size (pax-19980903.tar.gz) = 107929 bytes
-SHA1 (patch-aa) = e9674773062b4a1460cbaae6a17470cae842d74d
-SHA1 (patch-ab) = bdce9379355a311753b9b18c3a711073fad7914d
+SHA1 (patch-aa) = 8a962043e9d6d276f4825b19777536ffcac3e7cc
+SHA1 (patch-ab) = 91769acd63abb536008adc15679521bbbd4b394d
+SHA1 (patch-ac) = 95dc91d8fde6015fbd90b121e2fea20442664476
+SHA1 (patch-ad) = 92b24ffa7b6658c91360a4236fb9662b4b40660d
+SHA1 (patch-ae) = f9986e09cc8abddeb196fe7b3ad3b9b14f75354d
+SHA1 (patch-af) = c184ff412edab7c5846a364e7b1e186cd2d8476d
+SHA1 (patch-ag) = 63d86e0a8bf631bb429fb1c63759f49d541513c7
+SHA1 (patch-ah) = c3910be2b2c432951e7f7fef30ca26397f890898
+SHA1 (patch-ai) = d1315ef5474384ebd9a1bd2679aa856ba428a235
+SHA1 (patch-aj) = d7d89b9dede9953a67cf8d63326e4011c2381f56
+SHA1 (patch-ak) = d2d7cdba4664d11c10f10978d331e40f7fead0c9
+SHA1 (patch-al) = d771a407dbd5c9efb2f8f50b7086383bd5b9d2a7
+SHA1 (patch-am) = f6e909711edfc6bdfb2d36cc9846b864a8fb9bbf
+SHA1 (patch-ao) = 3ee28b0664c88de3b1f6d4c475b7c8ddb0dca287
+SHA1 (patch-ap) = d2888dad422306330d06bfceb2e8f42a1b8316f3
+SHA1 (patch-aq) = 88162c10e10ee63c1f80611cbef0cf8584059d9e
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pax/patches/patch-aa,v
retrieving revision 1.2
diff -b -u -r1.2 patch-aa
--- patches/patch-aa	2000/01/10 01:03:35	1.2
+++ patches/patch-aa	2002/08/21 19:05:11
@@ -1,10 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2000/01/10 01:03:35 wiz Exp $
+$NetBSD:$
 
-Needed for 1.3
+--- tar.c.orig	Tue Aug 11 07:04:26 1998
++++ tar.c	Wed Aug 21 14:19:50 2002
+@@ -42,8 +42,10 @@
+ #if 0
+ static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
+ #else
++#ifndef __linux__
+ __RCSID("$NetBSD: tar.c,v 1.11 1998/08/10 22:35:02 tv Exp $");
+ #endif
++#endif
+ #endif /* not lint */
 
---- tar.c.BAK	Fri Apr 23 15:27:46 1999
-+++ tar.c	Fri Apr 23 15:31:40 1999
-@@ -63,6 +63,8 @@
+ #include <sys/types.h>
+@@ -63,6 +65,8 @@
  #include "extern.h"
  #include "tar.h"
  
@@ -13,3 +22,17 @@
  /*
   * Routines for reading, writing and header identify of various versions of tar
   */
+@@ -1115,8 +1119,13 @@
+ 	    ul_oct((u_long)arcn->sb.st_gid, hd->gid, sizeof(hd->gid), 3) ||
+ 	    ul_oct((u_long)arcn->sb.st_mtime,hd->mtime,sizeof(hd->mtime),3))
+ 		goto out;
++#ifdef netbsd
+ 	user = user_from_uid(arcn->sb.st_uid, 1);
+ 	group = group_from_gid(arcn->sb.st_gid, 1);
++#else
++	user = getpwuid(arcn->sb.st_uid) ? getpwuid(arcn->sb.st_uid)->pw_name : NULL;
++	group = getgrgid(arcn->sb.st_gid) ? getgrgid(arcn->sb.st_gid)->gr_name : NULL;
++#endif
+ 	zf_strncpy(hd->uname, user ? user : "", sizeof(hd->uname));
+ 	zf_strncpy(hd->gname, group ? group : "", sizeof(hd->gname));
+ 
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pax/patches/patch-ab,v
retrieving revision 1.2
diff -b -u -r1.2 patch-ab
--- patches/patch-ab	1999/04/23 13:47:44	1.2
+++ patches/patch-ab	2002/08/21 19:05:11
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 1999/04/23 13:47:44 hubertf Exp $
+$NetBSD:$
 
---- ../pwcache.c	Fri Apr 23 15:46:31 1999
-+++ pwcache.c	Fri Apr 23 15:54:27 1999
-@@ -46,7 +46,7 @@
+--- pwcache.c.orig	Wed Aug 21 14:28:15 2002
++++ pwcache.c	Wed Aug 21 14:30:21 2002
+@@ -45,7 +45,7 @@
  #endif
  #endif /* not lint */
  
@@ -11,7 +11,7 @@
  
  #include <sys/types.h>
  #include <sys/param.h>
-@@ -79,12 +79,13 @@
+@@ -78,12 +78,13 @@
  static UIDC **usrtb = NULL;	/* user name to uid cache */
  static GIDC **grptb = NULL;	/* group name to gid cache */
  
@@ -26,7 +26,7 @@
  static u_int
  st_hash(name, len, tabsz)
  	const char *name;
-@@ -100,6 +101,7 @@
+@@ -99,6 +100,7 @@
  
  	return (key % tabsz);
  }
@@ -34,7 +34,7 @@
  
  /*
   * uidtb_start
-@@ -213,6 +215,7 @@
+@@ -212,6 +214,7 @@
  	return (0);
  }
  
@@ -42,7 +42,7 @@
  /*
   * user_from_uid()
   *	caches the name (if any) for the uid. If noname clear, we always return the
-@@ -292,7 +295,9 @@
+@@ -291,7 +294,9 @@
  	}
  	return (ptr->name);
  }
@@ -52,7 +52,17 @@
  /*
   * group_from_gid()
   *	caches the name (if any) for the gid. If noname clear, we always return the
-@@ -372,6 +377,7 @@
+@@ -335,7 +340,9 @@
+ 	 * No entry for this gid, we will add it
+ 	 */
+ 	if (!gropn) {
++#ifndef __linux__
+ 		setgroupent(1);
++#endif
+ 		++gropn;
+ 	}
+ 
+@@ -371,6 +378,7 @@
  	}
  	return (ptr->name);
  }
@@ -60,7 +70,7 @@
  
  /*
   * uid_from_user()
-@@ -406,7 +412,7 @@
+@@ -405,7 +413,7 @@
  	 * look up in hash table, if found and valid return the uid,
  	 * if found and invalid, return a -1
  	 */
@@ -69,7 +79,17 @@
  	ptr = *pptr;
  
  	if ((ptr != NULL) && (ptr->valid > 0) && !strcmp(name, ptr->name)) {
-@@ -478,7 +484,7 @@
+@@ -416,7 +424,9 @@
+ 	}
+ 
+ 	if (!pwopn) {
++#ifndef __linux__
+ 		setpassent(1);
++#endif
+ 		++pwopn;
+ 	}
+ 
+@@ -477,7 +487,7 @@
  	 * look up in hash table, if found and valid return the uid,
  	 * if found and invalid, return a -1
  	 */
@@ -78,3 +98,13 @@
  	ptr = *pptr;
  
  	if ((ptr != NULL) && (ptr->valid > 0) && !strcmp(name, ptr->name)) {
+@@ -488,7 +498,9 @@
+ 	}
+ 
+ 	if (!gropn) {
++#ifndef __linux__
+ 		setgroupent(1);
++#endif
+ 		++gropn;
+ 	}
+ 

--ikeVEW9yuYc//A+q
Content-Type: application/x-tar-gz
Content-Disposition: attachment; filename="pax.linux.patches.tar.gz"
Content-Transfer-Encoding: base64

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
/3/4H12zYKEAeAAA

--ikeVEW9yuYc//A+q--