From owner-freebsd-emulation@FreeBSD.ORG Thu Dec 1 21:31:23 2005 Return-Path: X-Original-To: freebsd-emulation@freebsd.org Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA24116A41F for ; Thu, 1 Dec 2005 21:31:23 +0000 (GMT) (envelope-from q@galgenberg.net) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB55643D5A for ; Thu, 1 Dec 2005 21:31:21 +0000 (GMT) (envelope-from q@galgenberg.net) Received: from wrzx30.rz.uni-wuerzburg.de (wrzx30.rz.uni-wuerzburg.de [132.187.1.30]) by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id D11FB13F9DD; Thu, 1 Dec 2005 22:31:19 +0100 (CET) Received: from virusscan (localhost [127.0.0.1]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id B80399F4E5; Thu, 1 Dec 2005 22:31:19 +0100 (CET) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id 8E63A863AA; Thu, 1 Dec 2005 22:31:19 +0100 (CET) Received: from frodo.galgenberg.net (wwsx14.win-screen.uni-wuerzburg.de [132.187.253.14]) by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id 4668513F9DD; Thu, 1 Dec 2005 22:31:19 +0100 (CET) Received: from coyote.q.local (gb-21-237.galgenberg.net [172.16.21.237]) by frodo.galgenberg.net (8.13.1/8.13.1) with ESMTP id jB1LVIEX099433; Thu, 1 Dec 2005 22:31:19 +0100 (CET) (envelope-from q@galgenberg.net) Received: from roadrunner.q.local (roadrunner.q.local [192.168.0.148]) by coyote.q.local (8.13.4/8.13.4) with ESMTP id jB1LVI7x029594; Thu, 1 Dec 2005 22:31:18 +0100 (CET) (envelope-from q@galgenberg.net) Received: from roadrunner.q.local (localhost [127.0.0.1]) by roadrunner.q.local (8.13.4/8.13.4) with ESMTP id jB1LVIaD084462; Thu, 1 Dec 2005 22:31:18 +0100 (CET) (envelope-from q@galgenberg.net) Received: (from q@localhost) by roadrunner.q.local (8.13.4/8.13.4/Submit) id jB1LVHeY084461; Thu, 1 Dec 2005 22:31:17 +0100 (CET) (envelope-from q@galgenberg.net) Date: Thu, 1 Dec 2005 22:31:17 +0100 From: Ulrich Spoerlein To: Alexander Leidinger Message-ID: <20051201213117.GC1083@galgenberg.net> Mail-Followup-To: Alexander Leidinger , freebsd-emulation@freebsd.org References: <17284.32307.784247.207350@jerusalem.litteratus.org> <20051124105440.cqdu7ydpc084kgsc@netchild.homeip.net> <20051124125951.GD1054@galgenberg.net> <20051124180627.665225aa@Magellan.Leidinger.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4f28nU6agdXSinmL" Content-Disposition: inline In-Reply-To: <20051124180627.665225aa@Magellan.Leidinger.net> X-Virus-Scanned: by amavisd-new (Rechenzentrum Universitaet Wuerzburg) Cc: freebsd-emulation@freebsd.org Subject: Patch for emulators/linux_base-8 (was Re: warning) X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:31:23 -0000 --4f28nU6agdXSinmL Content-Type: multipart/mixed; boundary="UnaWdueM1EBWVRzC" Content-Disposition: inline --UnaWdueM1EBWVRzC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Alexander Leidinger wrote: > > The fix is, to tell /compat/linux/etc/nsswitch.conf to look at NIS too. >=20 > Besides the fact that I don't use NIS and that UID 0 is in my passwd > file: feel free to send a patch which takes /etc/nsswitch.conf and > generates an appropriate /compat/linux one. I don't know enough about nsswitch to take all side effects into account, therefore I settled for the cheap solution ... > > It's a minor inconvenience, that nsswitch.conf gets clobbered every time > > linux_base is reinstalled (and thereby breaking acroread7 for me). > Bug noted... but feel free to send a PR and/or patches which fixes this. I just knew you would answer like that :) Today I felt like fixing this, and this is the patch I came up with. Now that the second most annoying bug in Ports is fixed, I can take a stab at fixing *the* most annoying bug. Ulrich Spoerlein --=20 PGP Key ID: F0DB9F44 Encrypted mail welcome! Fingerprint: F1CE D062 0CA9 ADE3 349B 2FE8 980A C6B5 F0DB 9F44 Ok, which part of "Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn." didn't you understand? --UnaWdueM1EBWVRzC Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="linux_base-8.patch" Content-Transfer-Encoding: quoted-printable Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/emulators/linux_base-8/Makefile,v retrieving revision 1.110 diff -u -p -r1.110 Makefile --- Makefile 11 Nov 2005 19:54:16 -0000 1.110 +++ Makefile 1 Dec 2005 21:27:26 -0000 @@ -8,7 +8,7 @@ =20 PORTNAME=3D linux_base-8 PORTVERSION=3D 8.0 -PORTREVISION=3D 9 +PORTREVISION=3D 10 CATEGORIES=3D emulators linux MASTER_SITES=3D ${MASTER_SITE_REDHAT_LINUX} \ ${MASTER_SITE_REDHAT_LINUX:S/$/:new/} \ @@ -92,6 +92,9 @@ FALLBACK_ELF_MIB=3D kern.fallback_elf_bran LINUX_ELF=3D 3 PREVIOUS_ELF!=3D /sbin/sysctl -n ${FALLBACK_ELF_MIB} =20 +# FIXME. This will result in a file at /compat/linux/etcnsswitch.conf.dist= (sic!) +RPMFLAGS+=3D --relocate /etc/nsswitch.conf=3D/etc/nsswitch.conf.dist --bad= reloc + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -109,6 +112,9 @@ do-install: ${ECHO} $$R; \ ${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \ done + @${MV} ${PREFIX}/etcnsswitch.conf.dist ${PREFIX}/etc/nsswitch.conf.dist + @test -f ${PREFIX}/etc/nsswitch.conf || cp ${PREFIX}/etc/nsswitch.conf.di= st \ + ${PREFIX}/etc/nsswitch.conf @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 file \ | ${GREP} ELF | ${CUT} -d : -f 1 \ Index: pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/emulators/linux_base-8/pkg-plist,v retrieving revision 1.3 diff -u -p -r1.3 pkg-plist --- pkg-plist 11 Nov 2005 19:54:16 -0000 1.3 +++ pkg-plist 1 Dec 2005 21:27:28 -0000 @@ -51,7 +51,9 @@ etc/ld.so.cache etc/ld.so.conf etc/logrotate.d/rpm etc/mtab -etc/nsswitch.conf +@unexec if cmp -s %D/etc/nsswitch.conf.dist %D/etc/nsswitch.conf; then rm = -f %D/etc/nsswitch.conf; fi +etc/nsswitch.conf.dist +@exec [ -f %D/etc/nsswitch.conf ] || cp %D/etc/nsswitch.conf.dist %D/etc/n= sswitch.conf etc/pam.d/su etc/profile etc/profile.d/colorls.csh --UnaWdueM1EBWVRzC-- --4f28nU6agdXSinmL Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDj2ulmArGtfDbn0QRAqNNAKC94d1vDInUb7lUS4O6URW/BUK/tgCg5Zgc D/6R4ZKBo/izKH4j7haXUyk= =MReg -----END PGP SIGNATURE----- --4f28nU6agdXSinmL--