From fe9524db06c1bc792de74ac694b731f007959ca78b586aaf7e0a10c60103facf Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 16 Sep 2009 20:09:07 +0000
Subject: [PATCH] Accepting request 20423 from Base:System

Copy from Base:System/glibc based on submit request 20423 from user pbaudis

OBS-URL: https://build.opensuse.org/request/show/20423
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=10
---
 crypt_blowfish-1.0-suse.diff |  2 +-
 glibc.changes                |  6 +++++
 glibc.spec                   |  8 +++++--
 usr.sbin.nscd                | 43 ++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 usr.sbin.nscd

diff --git a/crypt_blowfish-1.0-suse.diff b/crypt_blowfish-1.0-suse.diff
index 506adbf..3f16758 100644
--- a/crypt_blowfish-1.0-suse.diff
+++ b/crypt_blowfish-1.0-suse.diff
@@ -51,7 +51,7 @@ diff -ruN crypt-/crypt_blowfish.c crypt/crypt_blowfish.c
 +#ifdef __i386__
 +#define BF_ASM				0 /* original OW patch has 1 */
 +#define BF_SCALE			1
-+#elif defined(__alpha__) || defined(__hppa__)
++#elif defined(__alpha__) || defined(__hppa__) || defined(__x86_64__)
 +#define BF_ASM				0
 +#define BF_SCALE			1
 +#else
diff --git a/glibc.changes b/glibc.changes
index 5006f72..66df69b 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep  8 13:15:04 CEST 2009 - pbaudis@suse.cz
+
+- Provide the /etc/apparmor.d/usr.sbin.nscd file [bnc#535467]
+- Blowfish: Enable BF_SCALE even on x86_64
+
 -------------------------------------------------------------------
 Sat Sep  5 23:19:51 CEST 2009 - pbaudis@suse.cz
 
diff --git a/glibc.spec b/glibc.spec
index 52f68fc..a445b66 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -69,7 +69,7 @@ Obsoletes:      glibc-32bit
 Provides:       rtld(GNU_HASH)
 AutoReqProv:    on
 Version:        2.10.1
-Release:        7
+Release:        8
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,6 +79,7 @@ Source:         glibc-%{version}-aa152ec6ad.tar.bz2
 Source2:        glibc-ports-%{version}-2b2b217196.tar.bz2
 Source3:        noversion.tar.bz2
 Source4:        manpages.tar.bz2
+Source5:        usr.sbin.nscd
 Source8:        nsswitch.conf
 Source9:        nscd.init
 Source10:       bindresvport.blacklist
@@ -702,8 +703,10 @@ cp -p manual/libc/*.html $RPM_BUILD_ROOT/usr/share/doc/glibc
 #
 # Install nscd tools
 #
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
 cp nscd/nscd.conf $RPM_BUILD_ROOT/etc
+mkdir -p $RPM_BUILD_ROOT/etc/apparmor.d
+cp $RPM_SOURCE_DIR/usr.sbin.nscd $RPM_BUILD_ROOT/etc/apparmor.d
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
 install -m 755 $RPM_SOURCE_DIR/nscd.init $RPM_BUILD_ROOT/etc/init.d/nscd
 ln -sf /etc/init.d/nscd $RPM_BUILD_ROOT/usr/sbin/rcnscd
 mkdir -p $RPM_BUILD_ROOT/var/run/nscd
@@ -1033,6 +1036,7 @@ exit 0
 %files -n nscd
 %defattr(-,root,root)
 %config(noreplace) /etc/nscd.conf
+%config /etc/apparmor.d/usr.sbin.nscd
 %config /etc/init.d/nscd
 /usr/sbin/nscd
 /usr/sbin/rcnscd
diff --git a/usr.sbin.nscd b/usr.sbin.nscd
new file mode 100644
index 0000000..3733977
--- /dev/null
+++ b/usr.sbin.nscd
@@ -0,0 +1,43 @@
+# Last Modified: Wed Aug 15 10:55:46 2007
+# $Id: usr.sbin.nscd 1313 2008-11-05 12:03:29Z jrjohansen $
+# ------------------------------------------------------------------
+#
+#    Copyright (C) 2002-2005 Novell/SUSE
+#
+#    This program is free software; you can redistribute it and/or
+#    modify it under the terms of version 2 of the GNU General Public
+#    License published by the Free Software Foundation.
+#
+# ------------------------------------------------------------------
+
+#include <tunables/global>
+/usr/sbin/nscd {
+  #include <abstractions/base>
+  #include <abstractions/consoles>
+  #include <abstractions/nameservice>
+  #include <abstractions/ssl_certs>
+
+  capability net_bind_service,
+
+  network inet dgram,
+  network inet stream,
+
+  /etc/netgroup r,
+  /etc/nscd.conf r,
+  /tmp/.winbindd/pipe rw,
+  /usr/sbin/nscd rmix,
+  /var/lib/samba/winbindd_privileged/pipe rw,
+  /var/run/.nscd_socket wl,
+  /var/run/avahi-daemon/socket w,
+  /var/run/nscd/ r,
+  /var/run/nscd/db* wl,
+  /var/run/nscd/socket wl,
+  /var/run/nscd/{passwd,group,services,hosts} rw,
+  /var/run/{nscd/,}nscd.pid rwl,
+  /var/log/nscd.log rw,
+  @{PROC}/[0-9]*/fd/ r,
+  @{PROC}/[0-9]*/fd/* r,
+  @{PROC}/[0-9]*/maps r,
+  @{PROC}/[0-9]*/mounts r,
+  @{PROC}/filesystems r,
+}