ports/66933: fix port: secirity/sfs

[Yen-Ming Lee]

>Number:         66933
>Category:       ports
>Synopsis:       fix port: secirity/sfs
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 20 02:50:27 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.2.1-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.2.1-RELEASE-p6 FreeBSD 5.2.1-RELEASE-p6 #94: Mon May 17 05:16:45 CST 2004 root at utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386


	
>Description:

- add files/patch-nfsclient and unbreak this port
- use UID/GID other than 71:71 which is registered by oracle already
- add USE_LIBTOOL and remove *.la in PLIST
- minor fixes in PLIST

>How-To-Repeat:
	
>Fix:

	

--- sfs.diff begins here ---
diff -ruN --exclude CVS /usr/ports/security/sfs/Makefile sfs/Makefile
--- /usr/ports/security/sfs/Makefile	Wed Feb  4 15:27:10 2004
+++ sfs/Makefile	Thu May 20 09:42:59 2004
@@ -20,7 +20,7 @@
 INFO=		sfs
 
 USE_GMAKE=	yes
-
+USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-sfsuser=sfs \
 		--with-sfsgroup=sfs \
@@ -30,13 +30,9 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 .if ${OSVERSION} > 500000
 LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=--with-gmp=${PREFIX}
+CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-gmp=/usr
 .endif
diff -ruN --exclude CVS /usr/ports/security/sfs/files/patch-nfsclient sfs/files/patch-nfsclient
--- /usr/ports/security/sfs/files/patch-nfsclient	Thu Jan  1 08:00:00 1970
+++ sfs/files/patch-nfsclient	Wed May 19 22:43:53 2004
@@ -0,0 +1,20 @@
+--- nfsconf.h.orig	Wed May 19 22:42:39 2004
++++ nfsconf.h	Wed May 19 22:43:24 2004
+@@ -33,6 +33,7 @@
+ # include <nfs/nfs.h>
+ #endif /* NEED_NFS_NFS_H */
+ #if NEED_NFSCLIENT_NFS_H
++# include <nfs/nfsproto.h>
+ # include <nfsclient/nfs.h>
+ #endif /* NEED_NFSCLIENT_NFS_H */
+ #if NEED_NFS_MOUNT_H
+--- configure.orig	Wed May 19 22:43:05 2004
++++ configure	Wed May 19 22:41:46 2004
+@@ -9661,6 +9661,7 @@
+ 	cat >conftest.$ac_ext <<_ACEOF
+ #line 9662 "configure"
+ #include "confdefs.h"
++#include <nfs/nfsproto.h>
+ #include <nfsclient/nfs.h>
+ 
+ _ACEOF
diff -ruN --exclude CVS /usr/ports/security/sfs/pkg-install sfs/pkg-install
--- /usr/ports/security/sfs/pkg-install	Thu Jan  2 18:02:06 2003
+++ sfs/pkg-install	Thu May 20 11:42:06 2004
@@ -8,8 +8,8 @@
 
 USER=sfs
 GROUP=sfs
-UID=71
-GID=71
+UID=171
+GID=171
 PW=/usr/sbin/pw
 
 SFSDIR=/var/spool/sfs
diff -ruN --exclude CVS /usr/ports/security/sfs/pkg-plist sfs/pkg-plist
--- /usr/ports/security/sfs/pkg-plist	Sun Oct  5 10:21:12 2003
+++ sfs/pkg-plist	Thu May 20 10:26:43 2004
@@ -11,6 +11,7 @@
 etc/rc.d/sfscd.sh.sample
 @unexec if [ -f %D/etc/rc.d/sfssd.sh ]; then cmp -s %D/etc/rc.d/sfssd.sh.sample %D/etc/rc.d/sfssd.sh && rm -f %D/etc/rc.d/sfssd.sh || echo "${PKG_PREFIX}/etc/rc.d/sfssd.sh is different than distribution sample, leaving for manual cleanup." | fmt; fi
 etc/rc.d/sfssd.sh.sample
+etc/sfs/sfs_host_key
 etc/sfs/sfsrwsd_config.sample
 include/sfs
 include/sfs.h
@@ -136,15 +137,10 @@
 lib/sfs-%%SFS_VERSION%%/aiod
 lib/sfs-%%SFS_VERSION%%/connect
 lib/sfs-%%SFS_VERSION%%/libarpc.a
-lib/sfs-%%SFS_VERSION%%/libarpc.la
 lib/sfs-%%SFS_VERSION%%/libasync.a
-lib/sfs-%%SFS_VERSION%%/libasync.la
 lib/sfs-%%SFS_VERSION%%/libsfscrypt.a
-lib/sfs-%%SFS_VERSION%%/libsfscrypt.la
 lib/sfs-%%SFS_VERSION%%/libsfsmisc.a
-lib/sfs-%%SFS_VERSION%%/libsfsmisc.la
 lib/sfs-%%SFS_VERSION%%/libsvc.a
-lib/sfs-%%SFS_VERSION%%/libsvc.la
 lib/sfs-%%SFS_VERSION%%/listen
 lib/sfs-%%SFS_VERSION%%/mallock.o
 lib/sfs-%%SFS_VERSION%%/moduled
@@ -158,9 +154,7 @@
 lib/sfs-%%SFS_VERSION%%/sfsrwcd
 lib/sfs-%%SFS_VERSION%%/sfsrwsd
 lib/sfs-%%SFS_VERSION%%/upgradedb.pl
- at group sfs
 lib/sfs-%%SFS_VERSION%%/suidconnect
- at group
 lib/sfs-%%SFS_VERSION%%/ttyd
 lib/sfs-%%SFS_VERSION%%/xfer
 @dirrm lib/sfs-%%SFS_VERSION%%
@@ -168,15 +162,16 @@
 sbin/sfscd
 sbin/sfssd
 sbin/vidb
-share/doc/sfs/WELCOME
-share/doc/sfs/README
-share/doc/sfs/README.packageblurb
-share/doc/sfs/README.0.7-upgrade
- at dirrm share/doc/sfs
+%%DOCSDIR%%/WELCOME
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README.packageblurb
+%%DOCSDIR%%/README.0.7-upgrade
+ at dirrm %%DOCSDIR%%
 share/sfs/agentrc
 share/sfs/sfs_config
 share/sfs/sfs_srp_parms
 share/sfs/sfsauthd_config
 share/sfs/sfscd_config
 share/sfs/sfssd_config
+ at dirrm etc/sfs
 @dirrm share/sfs
--- sfs.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: