r5272 - in glibc-package/trunk/debian: . debhelper.in local/etc
Author: aurel32
Date: 2012-06-03 16:10:48 +0000 (Sun, 03 Jun 2012)
New Revision: 5272
Added:
glibc-package/trunk/debian/debhelper.in/libc-bin.postinst
glibc-package/trunk/debian/local/etc/nsswitch.conf
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-bin.dirs
glibc-package/trunk/debian/debhelper.in/libc-bin.install
Log:
* Take-over nsswitch.conf installation from base-files. Closes:
#673271.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-06-03 16:02:00 UTC (rev 5271)
+++ glibc-package/trunk/debian/changelog 2012-06-03 16:10:48 UTC (rev 5272)
@@ -48,6 +48,8 @@
(CVE-2011-4609). Closes: #671478.
* patches/kfreebsd/local-use-thr-primitives.diff: bump LinuxThreads
version. Closes: #675606.
+ * Take-over nsswitch.conf installation from base-files. Closes:
+ #673271.
-- Clint Adams <clint@debian.org> Fri, 04 May 2012 23:39:00 -0400
Modified: glibc-package/trunk/debian/debhelper.in/libc-bin.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.dirs 2012-06-03 16:02:00 UTC (rev 5271)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.dirs 2012-06-03 16:10:48 UTC (rev 5272)
@@ -1 +1,2 @@
usr/lib/locale
+usr/share/libc-bin
Modified: glibc-package/trunk/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.install 2012-06-03 16:02:00 UTC (rev 5271)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.install 2012-06-03 16:10:48 UTC (rev 5272)
@@ -1,6 +1,8 @@
-debian/local/etc/* /etc
-nis/nss /etc/default
-posix/gai.conf /etc
+debian/local/etc/bindresvport.blacklist etc
+debian/local/etc/ld.so.conf.d etc
+debian/local/etc/nsswitch.conf usr/share/libc-bin
+nis/nss etc/default
+posix/gai.conf etc
debian/tmp-libc/sbin/ldconfig sbin
debian/tmp-libc/usr/bin/catchsegv usr/bin
debian/tmp-libc/usr/bin/getconf usr/bin
Added: glibc-package/trunk/debian/debhelper.in/libc-bin.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.postinst (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.postinst 2012-06-03 16:10:48 UTC (rev 5272)
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+export LC_ALL=C
+
+install_from_default() {
+ if [ ! -f $2 ]; then
+ cp -p $1 $2
+ fi
+}
+
+if [ "$1" = "configure" ] && [ "$2" = "" ] ; then
+ install_from_default /usr/share/libc-bin/nsswitch.conf /etc/nsswitch.conf
+fi
+
+#DEBHELPER#
+
+exit 0
+
Added: glibc-package/trunk/debian/local/etc/nsswitch.conf
===================================================================
--- glibc-package/trunk/debian/local/etc/nsswitch.conf (rev 0)
+++ glibc-package/trunk/debian/local/etc/nsswitch.conf 2012-06-03 16:10:48 UTC (rev 5272)
@@ -0,0 +1,19 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+# If you have the `glibc-doc-reference' and `info' packages installed, try:
+# `info libc "Name Service Switch"' for information about this file.
+
+passwd: compat
+group: compat
+shadow: compat
+
+hosts: files dns
+networks: files
+
+protocols: db files
+services: db files
+ethers: db files
+rpc: db files
+
+netgroup: nis
Reply to: