--- ncpfs.spec-orig	2006-11-07 02:39:43 +0200
+++ ncpfs.spec-orig	2006-12-16 22:02:11 +0200
@@ -1,6 +1,6 @@ 
 Name: ncpfs
 Version: 2.2.6
-Release: alt4
+Release: alt4.1
 
 Summary: Utilities for the %name filesystem, a NetWare client for Linux
 License: GPL
@@ -8,6 +8,7 @@ 
 
 Source: ftp://platan.vc.cvut.cz/pub/linux/%name/%name-%version/%name-%version.tar.gz
 Source1: mount.ncp
+Source2: ncpfs.control
 
 Patch0: %name-2.2.6-alt-makefile.patch
 Patch1: %name-2.2.6-alt-compile.patch
@@ -20,11 +21,12 @@ 
 Patch13: ncpfs-2.2.6-getuid.patch
 Patch15: ncpfs-2.2.6-align.patch
 
-
 Requires: libncp = %version
 
 # Automatically added by buildreq on Wed Oct 08 2003
-BuildRequires: libpam-devel glibc-kernheaders
+BuildRequires: control libpam-devel glibc-kernheaders
+
+%define controlled_binaries ncpmount ncpumount slist
 
 %package -n libncp
 Summary: Shared library for access the %name filesystem
@@ -85,6 +87,7 @@ 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+# wow
 exit
 
 %patch10 -p1
@@ -94,19 +97,19 @@ 
 %patch15 -p1
 
 %build
-%__make distclean
+make distclean
 %configure \
- --enable-pam \
- --disable-function-sections \
- --disable-mount-v2
+	--enable-pam \
+	--disable-function-sections \
+	--disable-mount-v2
 
 %make_build
 %make_build -C ipxdump
-%__cp -p ipxdump/README README.ipxdump
-%__cp -p contrib/pam/README README.pam_ncp
+cp -p ipxdump/README README.ipxdump
+cp -p contrib/pam/README README.pam_ncp
 
 %install
-%__mkdir_p %buildroot{/sbin,%_sbindir,/lib/security}
+mkdir -p %buildroot{/sbin,%_sbindir,/lib/security}
 %makeinstall install-dev \
 	libsodir=%buildroot/%_libdir \
 	libadir=%buildroot/%_libdir \
@@ -114,23 +117,39 @@ 
 
 # Move these to permit /usr from NFS
 for f in ipx_{configure,internal_net,interface}; do
-	%__mv "%buildroot/%_bindir/$f" "%buildroot/sbin/$f"
+	mv "%buildroot/%_bindir/$f" "%buildroot/sbin/$f"
 done
 
-%__install -p -m755 ipxdump/ipx{dump,parse} %buildroot/%_bindir
+install -p -m755 ipxdump/ipx{dump,parse} %buildroot/%_bindir
 
-%__ln_s ..%_bindir/ncpmount %buildroot/sbin/mount.ncp
-%__ln_s mount.ncp %buildroot/sbin/mount.ncpfs
+ln -s ..%_bindir/ncpmount %buildroot/sbin/mount.ncp
+ln -s mount.ncp %buildroot/sbin/mount.ncpfs
 
 # These could be SUID root, but it's a security hole.
-%__chmod a-s %buildroot/%_bindir/*
+# PS: we'll let local sysadmin control that
+chmod a-s %buildroot/%_bindir/*
+
+for n in %controlled_binaries; do
+	install -pD -m755 %SOURCE2 "%buildroot%_controldir/$n"
+	subst -p "s/@NAME@/$n/" "%buildroot%_controldir/$n"
+done
 
 %find_lang %name
 
+%pre
+/usr/sbin/groupadd -r -f netadmin
+for n in %controlled_binaries; do
+	%pre_control $n
+done
+
+%post
+for n in %controlled_binaries; do
+	%post_control -s restricted $n
+done
+
 %post -n libncp -p %post_ldconfig
 %postun -n libncp -p %postun_ldconfig
 
-
 %files -n libncp
 %_libdir/*.so.*
 
@@ -140,15 +159,19 @@ 
 %_includedir/*
 %_man3dir/*
 
+# %controlled_binaries aren't %attr(0700,root,root)
+# since they aren't dangerous being unprivileged
+# even between unpacking and initializing control mode
 %files -f %name.lang
 /sbin/m*
 %_sbindir/*
 %_bindir/[nps]*
 /lib/security/*
-%_mandir/man1/*
-%_mandir/man5/*
-%_mandir/man8/n*
-%_mandir/man8/mount.ncp.8*
+%config %_controldir/*
+%_man1dir/*
+%_man5dir/*
+%_man8dir/n*
+%_man8dir/mount.ncp.8*
 %doc BUGS Changes ConfigFile INSTALL FAQ README README.pam_ncp
 
 %files -n ipxutils
@@ -158,6 +181,10 @@ 
 %doc ipx-1.0/COPYING ipx-1.0/README README.ipxdump
 
 %changelog
+* Sat Dec 16 2006 Michael Shigorin <mike@altlinux.org> 2.2.6-alt4.1
+- spec macro abuse (+other minor things) cleanup
+- added control(8) support (fixes #2275, partially #2289)
+
 * Tue Nov 07 2006 Dmitry Lebkov <dlebkov@altlinux.ru> 2.2.6-alt4
 - rebuild with latest ALT Sisyphus