Date: Thu, 1 Dec 2005 22:31:17 +0100 From: Ulrich Spoerlein <q@galgenberg.net> To: Alexander Leidinger <Alexander@Leidinger.net> Cc: freebsd-emulation@freebsd.org Subject: Patch for emulators/linux_base-8 (was Re: warning) Message-ID: <20051201213117.GC1083@galgenberg.net> In-Reply-To: <20051124180627.665225aa@Magellan.Leidinger.net> References: <17284.32307.784247.207350@jerusalem.litteratus.org> <20051124105440.cqdu7ydpc084kgsc@netchild.homeip.net> <20051124125951.GD1054@galgenberg.net> <20051124180627.665225aa@Magellan.Leidinger.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051201213117.GC1083>