diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ja-samba/Makefile | 3 | ||||
-rw-r--r-- | net/ja-samba/Makefile.common | 4 | ||||
-rw-r--r-- | net/ja-samba/PLIST | 3 | ||||
-rw-r--r-- | net/ja-samba/distinfo | 15 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-aa | 22 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ab | 6 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ac | 10 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ah | 20 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-av | 23 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-bb | 24 |
10 files changed, 29 insertions, 101 deletions
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index d6c26d660ef..ec5853b0406 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2003/07/17 22:51:17 grant Exp $ +# $NetBSD: Makefile,v 1.19 2003/08/30 01:31:11 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 diff --git a/net/ja-samba/Makefile.common b/net/ja-samba/Makefile.common index da452d2c040..15018430e0a 100644 --- a/net/ja-samba/Makefile.common +++ b/net/ja-samba/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.3 2003/05/27 15:59:08 taca Exp $ +# $NetBSD: Makefile.common,v 1.4 2003/08/30 01:31:11 taca Exp $ DISTNAME= samba-${SAMBA_BASE_VERS}-ja-${SAMBA_JA_VERS} SAMBA_BASE_VERS= 2.2.8a -SAMBA_JA_VERS= 1.0 +SAMBA_JA_VERS= 1.1 WRKSRC?= ${WRKDIR}/${DISTNAME}/source CATEGORIES?= net MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/samba-${SAMBA_BASE_VERS}-ja/ \ diff --git a/net/ja-samba/PLIST b/net/ja-samba/PLIST index 1abeaa18d0d..a38c650d9d3 100644 --- a/net/ja-samba/PLIST +++ b/net/ja-samba/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.6 2003/06/04 16:25:33 taca Exp $ +@comment $NetBSD: PLIST,v 1.7 2003/08/30 01:31:11 taca Exp $ bin/findsmb -bin/make_nftable bin/make_printerdef bin/make_smbcodepage bin/make_unicodemap diff --git a/net/ja-samba/distinfo b/net/ja-samba/distinfo index 6687ee16942..91b65228e06 100644 --- a/net/ja-samba/distinfo +++ b/net/ja-samba/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.11 2003/06/04 16:25:33 taca Exp $ +$NetBSD: distinfo,v 1.12 2003/08/30 01:31:12 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 -SHA1 (patch-aa) = f04a3baba798e8b7cac82dd4e1d88f08bf538638 -SHA1 (patch-ab) = 2ae8f8a86a638cb183ef8b414cb971ebd8ce1d3e -SHA1 (patch-ac) = 37d928fb85bab1c954122bae79811ddcaa22f188 +SHA1 (samba-2.2.8a-ja-1.1.tar.bz2) = 3069f47d00224f48a2d0a1604adce195a17d7f9d +Size (samba-2.2.8a-ja-1.1.tar.bz2) = 7474236 bytes +SHA1 (patch-aa) = aab982c0eee1dbd8c70de0c2e5e2cfe46d5b7e87 +SHA1 (patch-ab) = da27a47ee94d64793b4dd1baf3778f9fa30ba755 +SHA1 (patch-ac) = 068da71c70a29009d2b36d261b49fc2848dadc6d SHA1 (patch-ad) = 358a9218bbe45cc5463a112ff6f2dec1b78da99e -SHA1 (patch-ah) = 0c9bf86a73f70826dbef36575119fc29d36ba102 SHA1 (patch-ai) = f29a725a65d8fff435bcef64c29acd4066101f83 SHA1 (patch-ak) = 0e3cbb4ac58a3445224779d72153e2bba5a4b6c2 SHA1 (patch-al) = e7caad8f6743537469866f9b47b0044ec95852ad @@ -15,5 +14,3 @@ 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-aa b/net/ja-samba/patches/patch-aa index 33cf852ab9b..966d683d624 100644 --- a/net/ja-samba/patches/patch-aa +++ b/net/ja-samba/patches/patch-aa @@ -1,31 +1,31 @@ -$NetBSD: patch-aa,v 1.4 2003/05/27 15:59:09 taca Exp $ +$NetBSD: patch-aa,v 1.5 2003/08/30 01:31:13 taca Exp $ ---- Makefile.in.orig 2003-05-20 12:13:24.000000000 +0900 +--- Makefile.in.orig 2003-08-22 17:45:57.000000000 +0900 +++ Makefile.in -@@ -105,6 +105,8 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $ - FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) - FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) +@@ -117,6 +117,8 @@ LDSHFLAGSPO = @LDSHFLAGS@ @ARCHFLAGPO@ + LDSHFLAGS32 = @LDSHFLAGS@ @ARCHFLAG32@ + LDSHFLAGS64 = @LDSHFLAGS@ @ARCHFLAG64@ +PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@ + WINBIND_PROGS = @WINBIND_TARGETS@ WINBIND_SPROGS = @WINBIND_STARGETS@ WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@ -@@ -713,7 +715,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB +@@ -753,7 +755,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy @echo Linking shared library $@ -- $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(LDAPLIBS) -lc \ -+ $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(LDAPLIBS) $(PAM_NEEDS_LIBC) \ +- $(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(SHDYNEXP) $(SOLIBS) $(LDAPLIBS) -lc \ ++ $(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(SHDYNEXP) $(SOLIBS) $(LDAPLIBS) $(PAM_NEEDS_LIBC) \ @SONAMEFLAG@`basename $@` nsswitch/libnss_wins.@SHLIBEXT@: $(NSS_OBJ) -@@ -737,7 +739,7 @@ nsswitch/libnss_winbind.@SHLIBEXT@: $(WI +@@ -777,7 +779,7 @@ nsswitch/libnss_winbind.@SHLIBEXT@: $(WI nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ) @echo Linking $@ -- @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) \ -+ @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) $(LDFLAGS) $(DYNEXP) $(PAM_NEEDS_LIBC) \ +- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) \ ++ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) $(LDFLAGS) $(DYNEXP) $(PAM_NEEDS_LIBC) \ @SONAMEFLAG@`basename $@` bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ diff --git a/net/ja-samba/patches/patch-ab b/net/ja-samba/patches/patch-ab index 192d2e2a55f..a74da301d49 100644 --- a/net/ja-samba/patches/patch-ab +++ b/net/ja-samba/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2003/05/27 15:59:09 taca Exp $ +$NetBSD: patch-ab,v 1.5 2003/08/30 01:31:13 taca Exp $ ---- configure.in.orig 2003-05-20 12:13:24.000000000 +0900 +--- configure.in.orig 2003-08-22 17:45:59.000000000 +0900 +++ configure.in -@@ -2106,6 +2106,10 @@ AC_ARG_WITH(pam, +@@ -2328,6 +2328,10 @@ AC_ARG_WITH(pam, # we can't build a pam module if we don't have pam. AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)]) diff --git a/net/ja-samba/patches/patch-ac b/net/ja-samba/patches/patch-ac index b7b2e29968a..e51d23a36c6 100644 --- a/net/ja-samba/patches/patch-ac +++ b/net/ja-samba/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2003/05/27 15:59:09 taca Exp $ +$NetBSD: patch-ac,v 1.5 2003/08/30 01:31:13 taca Exp $ ---- configure.orig 2003-05-20 12:13:24.000000000 +0900 +--- configure.orig 2003-08-22 17:45:58.000000000 +0900 +++ configure -@@ -20408,6 +20408,49 @@ echo "${ECHO_T}no" >&6 +@@ -21463,6 +21463,49 @@ echo "${ECHO_T}no" >&6 fi; @@ -52,10 +52,10 @@ $NetBSD: patch-ac,v 1.4 2003/05/27 15:59:09 taca Exp $ ################################################# # check for a NISPLUS password database echo "$as_me:$LINENO: checking whether to use NISPLUS SAM database" >&5 -@@ -25919,6 +25962,7 @@ s,@TERMLIBS@,$TERMLIBS,;t t - s,@TERMLDFLAGS@,$TERMLDFLAGS,;t t +@@ -26993,6 +27036,7 @@ s,@TERMLDFLAGS@,$TERMLDFLAGS,;t t s,@ROFF@,$ROFF,;t t s,@DYNEXP@,$DYNEXP,;t t + s,@SHDYNEXP@,$SHDYNEXP,;t t +s%@PAM_NEEDS_LIBC@%$PAM_NEEDS_LIBC%g s,@LDAPLIBS@,$LDAPLIBS,;t t s,@QUOTAOBJS@,$QUOTAOBJS,;t t diff --git a/net/ja-samba/patches/patch-ah b/net/ja-samba/patches/patch-ah deleted file mode 100644 index 71dfd3663b2..00000000000 --- a/net/ja-samba/patches/patch-ah +++ /dev/null @@ -1,20 +0,0 @@ -$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-av b/net/ja-samba/patches/patch-av deleted file mode 100644 index b49834023c5..00000000000 --- a/net/ja-samba/patches/patch-av +++ /dev/null @@ -1,23 +0,0 @@ -$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 deleted file mode 100644 index edc2efab79c..00000000000 --- a/net/ja-samba/patches/patch-bb +++ /dev/null @@ -1,24 +0,0 @@ -$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")); - |