diff options
author | taca <taca> | 2003-06-04 16:25:33 +0000 |
---|---|---|
committer | taca <taca> | 2003-06-04 16:25:33 +0000 |
commit | 4f1f54b2d6d09bfedcfe6cdcecdd2aa43551aec1 (patch) | |
tree | 652b21d9d8a3e36890ac10c3a7ffcba5ed85d9ba | |
parent | 9da0352cefd2a43128fac9ab134ca7683b1549b8 (diff) | |
download | pkgsrc-4f1f54b2d6d09bfedcfe6cdcecdd2aa43551aec1.tar.gz |
Update ja-samba package to 2.2.8.1.1.0nb1.
* Sync with net/samba package:
- clean up findsmp; no need to prepend ${WRKSRC}.
- Don't create ${PREFIX}/private.
- Stop installing HTML documentation.
* Allow longer share name to Windows XP and Windows 2003 server as well as
Windows 2000. Discussion was on the samba-jp mailing list.
-rw-r--r-- | net/ja-samba/Makefile | 14 | ||||
-rw-r--r-- | net/ja-samba/PLIST | 19 | ||||
-rw-r--r-- | net/ja-samba/distinfo | 7 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ah | 20 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ak | 13 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-av | 23 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-bb | 24 |
7 files changed, 91 insertions, 29 deletions
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index 45c82c88852..41ca3bad8bd 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2003/05/28 08:59:47 taca Exp $ +# $NetBSD: Makefile,v 1.17 2003/06/04 16:25:33 taca Exp $ .include "Makefile.common" PKGNAME= ja-samba-${SAMBA_BASE_VERS:S/a/.1/}.${SAMBA_JA_VERS} +PKGREVISION= 1 CATEGORIES= net MAINTAINER= tech-pkg-ja@jp.netbsd.org @@ -60,7 +61,6 @@ MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP} MESSAGE_SUBST+= ROOT_USER=${ROOT_USER} DOCDIR= ${PREFIX}/share/doc/samba -HTMLDIR= ${PREFIX}/share/doc/html/samba EXAMPLESDIR= ${PREFIX}/share/examples/samba CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf @@ -69,7 +69,7 @@ RCD_SCRIPTS= samba nmbd smbd OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500 -REPLACE_PERL= ${WRKSRC}/script/findsmb.in +REPLACE_PERL= script/findsmb.in # Remove irrelevant files for this package. post-extract: @@ -86,11 +86,11 @@ post-extract: post-install: # Install Samba documentation. - ${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKDIR}/${DISTNAME}/docs; \ - ${INSTALL_DATA} announce textdocs/* ${DOCDIR}; \ - ${INSTALL_DATA} Registry/*.reg ${DOCDIR}; \ - ${INSTALL_DATA} faq/*.html ${HTMLDIR} + for file in announce textdocs/* Registry/*.reg; do \ + ${INSTALL_DATA} $$file ${DOCDIR}; \ + done # Install Samba examples. ${INSTALL_DATA_DIR} ${EXAMPLESDIR} diff --git a/net/ja-samba/PLIST b/net/ja-samba/PLIST index cfc837b3527..1abeaa18d0d 100644 --- a/net/ja-samba/PLIST +++ b/net/ja-samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/05/27 15:59:08 taca Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/06/04 16:25:33 taca Exp $ bin/findsmb bin/make_nftable bin/make_printerdef @@ -80,22 +80,6 @@ sbin/mksmbpasswd sbin/nmbd sbin/smbd sbin/swat -share/doc/html/samba/Samba-Server-FAQ-1.html -share/doc/html/samba/Samba-Server-FAQ-2.html -share/doc/html/samba/Samba-Server-FAQ.html -share/doc/html/samba/Samba-meta-FAQ-1.html -share/doc/html/samba/Samba-meta-FAQ-2.html -share/doc/html/samba/Samba-meta-FAQ-3.html -share/doc/html/samba/Samba-meta-FAQ-4.html -share/doc/html/samba/Samba-meta-FAQ-5.html -share/doc/html/samba/Samba-meta-FAQ-6.html -share/doc/html/samba/Samba-meta-FAQ.html -share/doc/html/samba/sambafaq-1.html -share/doc/html/samba/sambafaq-2.html -share/doc/html/samba/sambafaq-3.html -share/doc/html/samba/sambafaq-4.html -share/doc/html/samba/sambafaq-5.html -share/doc/html/samba/sambafaq.html share/doc/samba/Application_Serving.txt share/doc/samba/BROWSING-Config.txt share/doc/samba/BROWSING.txt @@ -872,7 +856,6 @@ share/samba/swat/using_samba/ja/status.html share/samba/swat/using_samba/ja/this_edition.html share/samba/swat/using_samba/licenseinfo.html share/samba/swat/using_samba/this_edition.html -@dirrm share/doc/html/samba @dirrm share/doc/samba @dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd @dirrm share/examples/samba/LDAP/smbldap-tools/cgi diff --git a/net/ja-samba/distinfo b/net/ja-samba/distinfo index 12263d8a2de..6687ee16942 100644 --- a/net/ja-samba/distinfo +++ b/net/ja-samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2003/05/27 15:59:09 taca Exp $ +$NetBSD: distinfo,v 1.11 2003/06/04 16:25:33 taca Exp $ SHA1 (samba-2.2.8a-ja-1.0.tar.bz2) = da7d025429dedf75d16ef13a1b79f0063326c7ec Size (samba-2.2.8a-ja-1.0.tar.bz2) = 7445897 bytes @@ -6,11 +6,14 @@ SHA1 (patch-aa) = f04a3baba798e8b7cac82dd4e1d88f08bf538638 SHA1 (patch-ab) = 2ae8f8a86a638cb183ef8b414cb971ebd8ce1d3e SHA1 (patch-ac) = 37d928fb85bab1c954122bae79811ddcaa22f188 SHA1 (patch-ad) = 358a9218bbe45cc5463a112ff6f2dec1b78da99e +SHA1 (patch-ah) = 0c9bf86a73f70826dbef36575119fc29d36ba102 SHA1 (patch-ai) = f29a725a65d8fff435bcef64c29acd4066101f83 -SHA1 (patch-ak) = 24046b0ce52854f676015a5e25c9ffd23424efe4 +SHA1 (patch-ak) = 0e3cbb4ac58a3445224779d72153e2bba5a4b6c2 SHA1 (patch-al) = e7caad8f6743537469866f9b47b0044ec95852ad SHA1 (patch-am) = 92aa5e122529a30e05199cbe26620b3ac01adbc5 SHA1 (patch-an) = 55c7f9785c19d84b8ad74bbf0827162b156e2327 SHA1 (patch-ao) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41 SHA1 (patch-ap) = 199e2f8e5f2a5ac5aace21e6ada1fd8887a19059 SHA1 (patch-aq) = 73017f99efd1b4e3d93d8f14e63f0c43e391236d +SHA1 (patch-av) = d291ce9eaf34d44e5be30f90f1d5958bf28a4461 +SHA1 (patch-bb) = 241fc91815c1b2ec5f9757405ab6a744981e1a30 diff --git a/net/ja-samba/patches/patch-ah b/net/ja-samba/patches/patch-ah new file mode 100644 index 00000000000..71dfd3663b2 --- /dev/null +++ b/net/ja-samba/patches/patch-ah @@ -0,0 +1,20 @@ +$NetBSD: patch-ah,v 1.3 2003/06/04 16:25:33 taca Exp $ + +--- param/loadparm.c.orig 2003-05-20 11:28:38.000000000 +0900 ++++ param/loadparm.c +@@ -3857,8 +3857,14 @@ int lp_servicenumber(const char *pszServ + int iService; + fstring serviceName; + int len; ++ enum remote_arch_types ra_type; + +- len = (get_remote_arch() == RA_WIN2K) ? 127 : 12; ++ ra_type = get_remote_arch(); ++ if ((ra_type == RA_WIN2K) || (ra_type == RA_WINXP) || ++ (ra_type == RA_WIN2K3)) ++ len = 127; ++ else ++ len = 12; + + for (iService = iNumServices - 1; iService >= 0; iService--) + { diff --git a/net/ja-samba/patches/patch-ak b/net/ja-samba/patches/patch-ak index 29245bb74c7..f5b8cbc51c0 100644 --- a/net/ja-samba/patches/patch-ak +++ b/net/ja-samba/patches/patch-ak @@ -1,7 +1,16 @@ -$NetBSD: patch-ak,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $ +$NetBSD: patch-ak,v 1.2 2003/06/04 16:25:33 taca Exp $ ---- script/installbin.sh.orig Tue Oct 9 14:22:31 2001 +--- script/installbin.sh.orig 2001-10-09 14:22:31.000000000 +0900 +++ script/installbin.sh +@@ -11,7 +11,7 @@ shift + shift + shift + +-for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do ++for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do + if [ ! -d $d ]; then + mkdir $d + if [ ! -d $d ]; then @@ -30,7 +30,9 @@ mv $BINDIR/$p2 $BINDIR/$p2.old fi diff --git a/net/ja-samba/patches/patch-av b/net/ja-samba/patches/patch-av new file mode 100644 index 00000000000..b49834023c5 --- /dev/null +++ b/net/ja-samba/patches/patch-av @@ -0,0 +1,23 @@ +$NetBSD: patch-av,v 1.1 2003/06/04 16:25:33 taca Exp $ + +--- rpc_server/srv_srvsvc_nt.c.orig 2003-05-20 11:22:11.000000000 +0900 ++++ rpc_server/srv_srvsvc_nt.c +@@ -38,9 +38,16 @@ static void init_srv_share_info_1(pipes_ + pstring net_name; + pstring remark; + uint32 type; ++ int len; ++ enum remote_arch_types ra_type; + +- StrnCpy(net_name, lp_servicename(snum), +- (get_remote_arch() == RA_WIN2K) ? 127 : 12); ++ ra_type = get_remote_arch(); ++ if ((ra_type == RA_WIN2K) || (ra_type == RA_WINXP) || ++ (ra_type == RA_WIN2K3)) ++ len = 127; ++ else ++ len = 12; ++ StrnCpy(net_name, lp_servicename(snum), len); + pstrcpy(remark, lp_comment(snum)); + standard_sub_conn(p->conn, remark, sizeof(remark)); + len_net_name = strlen(net_name); diff --git a/net/ja-samba/patches/patch-bb b/net/ja-samba/patches/patch-bb new file mode 100644 index 00000000000..edc2efab79c --- /dev/null +++ b/net/ja-samba/patches/patch-bb @@ -0,0 +1,24 @@ +$NetBSD: patch-bb,v 1.5 2003/06/04 16:25:33 taca Exp $ + +--- smbd/trans2.c.orig 2003-05-20 11:17:19.000000000 +0900 ++++ smbd/trans2.c +@@ -921,7 +921,8 @@ static int call_trans2findfirst(connecti + SMB_STRUCT_STAT sbuf; + + ra_type = get_remote_arch(); +- NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K)); ++ NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) || ++ (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3) ); + + if (total_params < 12) + return(ERROR_DOS(ERRDOS,ERRinvalidparam)); +@@ -3100,7 +3101,8 @@ static int call_trans2getdfsreferral(con + int max_referral_level; + + ra_type = get_remote_arch(); +- NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K)); ++ NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) || ++ (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3) ); + + DEBUG(10,("call_trans2getdfsreferral\n")); + |