rpms/ncpfs/devel ncpfs-2.2.6-offsetof.patch, NONE, 1.1 ncpfs-2.2.6-ldconfig.patch, 1.1, 1.2 ncpfs.spec, 1.29, 1.30 ncpfs-2.2.3-array.patch, 1.1, NONE ncpfs-2.2.4-getuid.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Nov 9 04:46:39 UTC 2006 

Author: mitr

Update of /cvs/dist/rpms/ncpfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5748

Modified Files:
	ncpfs-2.2.6-ldconfig.patch ncpfs.spec 
Added Files:
	ncpfs-2.2.6-offsetof.patch 
Removed Files:
	ncpfs-2.2.3-array.patch ncpfs-2.2.4-getuid.patch 
Log Message:
* Thu Nov  9 2006 Miloslav Trmac <mitr at redhat.com> - 2.2.6-6
- Add missing #include <stddef.h> to fix build
- Remove unnecessary ncpfs-2.2.3-array.patch, the overflow was fixed in
  ncpfs-2.2.4.  Note that this changes the libncp ABI.
- Clean up %%install, manually list %%files
- Drop libncp.a
- Fix some rpmlint warnings


ncpfs-2.2.6-offsetof.patch:
 ncpm_common.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE ncpfs-2.2.6-offsetof.patch ---
--- ncpfs-2.2.6/sutil/ncpm_common.c.offsetof	2006-11-09 04:54:28.000000000 +0100
+++ ncpfs-2.2.6/sutil/ncpm_common.c	2006-11-09 04:54:36.000000000 +0100
@@ -82,6 +82,7 @@
 
 #include "ncpm_common.h"
 
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>

ncpfs-2.2.6-ldconfig.patch:
 Makefile.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: ncpfs-2.2.6-ldconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs-2.2.6-ldconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncpfs-2.2.6-ldconfig.patch	14 Nov 2005 11:30:01 -0000	1.1
+++ ncpfs-2.2.6-ldconfig.patch	9 Nov 2006 04:46:37 -0000	1.2
@@ -1,14 +1,3 @@
---- ncpfs-2.2.6/sutil/Makefile.in.ld	2005-11-14 12:25:57.000000000 +0100
-+++ ncpfs-2.2.6/sutil/Makefile.in	2005-11-14 12:26:12.000000000 +0100
-@@ -51,7 +51,7 @@
- 
- install: all
- 	${INSTALL} -d $(DESTDIR)$(bindir)
--	${INSTALL} -d $(DESTDIR)/sbin
-+#	${INSTALL} -d $(DESTDIR)/sbin
- 	${INSTALL} -m 4755 $(UTILS) $(DESTDIR)$(bindir)
- ifeq ($(USE_KERNEL),1)
- 	ln -sf ..$(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncp
 --- ncpfs-2.2.6/lib/Makefile.in.ld	2005-11-14 12:25:57.000000000 +0100
 +++ ncpfs-2.2.6/lib/Makefile.in	2005-11-14 12:25:57.000000000 +0100
 @@ -98,7 +98,7 @@


Index: ncpfs.spec
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ncpfs.spec	17 Jul 2006 23:47:25 -0000	1.29
+++ ncpfs.spec	9 Nov 2006 04:46:37 -0000	1.30
@@ -1,16 +1,16 @@
-Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux.
+Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux
 Name: ncpfs
 Version: 2.2.6
-Release: 5
+Release: 6
 License: GPL
 Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz
-Patch: ncpfs-2.2.3-fix.patch
-Patch1: ncpfs-2.2.3-array.patch
-Patch3: ncpfs-2.2.4-pie.patch
-Patch5: ncpfs-2.2.6-getuid.patch
-Patch6: ncpfs-2.2.4-gcc4.patch
-Patch7: ncpfs-2.2.6-ldconfig.patch
-Patch8: ncpfs-2.2.6-align.patch
+Patch0: ncpfs-2.2.3-fix.patch
+Patch1: ncpfs-2.2.4-pie.patch
+Patch2: ncpfs-2.2.6-getuid.patch
+Patch3: ncpfs-2.2.4-gcc4.patch
+Patch4: ncpfs-2.2.6-ldconfig.patch
+Patch5: ncpfs-2.2.6-align.patch
+Patch6: ncpfs-2.2.6-offsetof.patch
 Group: Applications/System
 Requires: ipxutils
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -29,7 +29,7 @@
 to use Novell NetWare files or services.
 
 %package -n ipxutils
-Summary: Tools for configuring and debugging IPX interfaces and networks.
+Summary: Tools for configuring and debugging IPX interfaces and networks
 Group: Applications/System
 
 %description -n ipxutils
@@ -42,13 +42,13 @@
 
 %prep
 %setup -q
-%patch -p1 -b .fix
-%patch1 -p1 -b .array
-%patch3 -p1 -b .pie
-%patch5 -p1 -b .getuid
-%patch6 -p1 -b .gcc4
-%patch7 -p1 -b .ld
-%patch8 -p1 -b .align
+%patch0 -p1 -b .fix
+%patch1 -p1 -b .pie
+%patch2 -p1 -b .getuid
+%patch3 -p1 -b .gcc4
+%patch4 -p1 -b .ld
+%patch5 -p1 -b .align
+%patch6 -p1 -b .offsetof
 
 %build
 %ifarch s390 s390x
@@ -63,63 +63,62 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-%makeinstall install-dev libsodir=$RPM_BUILD_ROOT%{_libdir} libadir=$RPM_BUILD_ROOT%{_libdir}
+make install install-dev DESTDIR="$RPM_BUILD_ROOT"
+make -C ipxdump install DESTDIR="$RPM_BUILD_ROOT"
 
 # Move ipx_configure/ipx_internal_net to permit /usr from NFS
-for i in ipx_configure ipx_internal_net ipx_interface ; do
-	mv $RPM_BUILD_ROOT/usr/bin/$i $RPM_BUILD_ROOT/sbin/$i
-done
-
-install -m755 ipxdump/ipxdump ipxdump/ipxparse $RPM_BUILD_ROOT/usr/bin/
+mv $RPM_BUILD_ROOT%{_bindir}/{ipx_configure,ipx_internal_net,ipx_interface} \
+	$RPM_BUILD_ROOT/sbin
 
 # these could be SUID root, but it's a security hole
-chmod 755 $RPM_BUILD_ROOT/usr/bin/ncpmount $RPM_BUILD_ROOT/usr/bin/ncpumount 
-ln -s mount.ncp $RPM_BUILD_ROOT/sbin/mount.ncpfs
-ln -s ../usr/bin/ncpmount $RPM_BUILD_ROOT/sbin/mount.ncp
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/{ncpmount,ncpumount}
 
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
 
-# file list
-find $RPM_BUILD_ROOT -type f -or -type l | \
-	grep -v ipx | grep -v mount.ncp.8| \
-	sed -e "s|$RPM_BUILD_ROOT||g" | \
-	grep -v "/usr/share/locale" | \
-	sed -e "s|/usr/bin/nwsfind|%attr(4755,root,root) /usr/bin/nwsfind|g" > rpm.files
-
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_includedir}/ncp/{ipxlib.h,kernel/ipx.h}
 
 %find_lang %name
 
-cat %{name}.lang >> rpm.files
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -f rpm.files
 
-%files -f rpm.files
+%files -f %name.lang
 %defattr(-,root,root)
-%doc BUGS COPYING Changes FAQ README 
-/usr/include
-%{_mandir}/man8/mount.ncp.8*
+%doc BUGS COPYING Changes FAQ README
+/sbin/mount.ncp*
+/sbin/nwmsg
+%attr(4755,root,root) %{_bindir}/nwsfind
+%{_bindir}/n[cps]*
+%{_bindir}/nw[^s]*
+%{_bindir}/[ps]*
+%{_libdir}/libncp.so*
+%exclude %{_libdir}/libncp.a
+%{_includedir}/ncp
+%{_sbindir}/nwmsg
+%{_mandir}/man*/[^i]*
 
 %files -n ipxutils
 %defattr(-,root,root)
 %doc ipx-1.0/COPYING ipx-1.0/README
 %doc ipxdump/README.ipxdump
 /sbin/ipx_*
-/usr/bin/ipx*
+%{_bindir}/ipx*
 %{_mandir}/man8/ipx*
 
 %changelog
+* Thu Nov  9 2006 Miloslav Trmac <mitr at redhat.com> - 2.2.6-6
+- Add missing #include <stddef.h> to fix build
+- Remove unnecessary ncpfs-2.2.3-array.patch, the overflow was fixed in
+  ncpfs-2.2.4.  Note that this changes the libncp ABI.
+- Clean up %%install, manually list %%files
+- Drop libncp.a
+- Fix some rpmlint warnings
+
 * Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 2.2.6-5
 - rebuild
 
@@ -221,7 +220,7 @@
 * Tue Jan 28 2002 Bill Nottingham <notting at redhat.com>
 - rebuild
 
-* Mon Jul 16 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jul 16 2001 Trond Eivind Glomsrød <teg at redhat.com>
 - s/Copyright/License/
 - langify
 - Don't explicitly strip
@@ -262,7 +261,7 @@
 - add patch to update to 2.2.0.16.a (#4051)
 
 * Tue Jul  6 1999 Bill Nottingham <notting at redhat.com>
-- oops, left ipx_interface out of %files
+- oops, left ipx_interface out of %%files
 
 * Mon Jun 14 1999 Bill Nottingham <notting at redhat.com>
 - update to 2.2.0.16


--- ncpfs-2.2.3-array.patch DELETED ---


--- ncpfs-2.2.4-getuid.patch DELETED ---

More information about the fedora-cvs-commits mailing list