diff options
| -rw-r--r-- | net/samba/Makefile | 10 | ||||
| -rw-r--r-- | net/samba/PLIST | 9 | ||||
| -rw-r--r-- | net/samba/distinfo | 7 | ||||
| -rw-r--r-- | net/samba/options.mk | 4 | ||||
| -rw-r--r-- | net/samba/patches/patch-ag | 54 |
5 files changed, 71 insertions, 13 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index c893d3613ab..30ccb1af19a 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.129 2004/09/14 17:18:05 jlam Exp $ +# $NetBSD: Makefile,v 1.129.2.1 2004/11/18 22:25:13 salo Exp $ -DISTNAME= samba-3.0.7 +DISTNAME= samba-3.0.8 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.samba.org/pub/samba/old-versions/ \ ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \ @@ -35,7 +36,7 @@ SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private -SAMBA_VARDIR?= /var +SAMBA_VARDIR?= ${VARBASE} FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR} FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} @@ -145,5 +146,8 @@ post-install: ${INSTALL_DATA} $${file} ${EGDIR}/pam_smbpass/$${file}; \ done .endif +.if !empty(PKG_OPTIONS:Mcups) + cd ${PREFIX}/libexec/cups/backend && ${LN} -s ../../../bin/smbspool smb +.endif .include "../../mk/bsd.pkg.mk" diff --git a/net/samba/PLIST b/net/samba/PLIST index b34cd4402a1..5914d07ce2f 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2004/09/14 17:18:06 jlam Exp $ +@comment $NetBSD: PLIST,v 1.24.2.1 2004/11/18 22:25:13 salo Exp $ bin/findsmb bin/net bin/nmblookup @@ -20,6 +20,7 @@ bin/smbtree ${SMBMOUNT}bin/smbumount bin/tdbbackup bin/tdbdump +bin/tdbtool bin/testparm bin/testprns bin/wbinfo @@ -55,6 +56,7 @@ lib/samba/vfs/recycle.so lib/samba/vfs/shadow_copy.so ${PAM}lib/security/pam_smbpass.so ${PAM}lib/security/pam_winbind.so +${CUPS}libexec/cups/backend/smb man/man1/editreg.1 man/man1/findsmb.1 man/man1/log2pcap.1 @@ -370,10 +372,6 @@ share/samba/swat/images/wizard.gif share/samba/swat/include/footer.html share/samba/swat/include/header.html share/samba/swat/lang/ja/help/welcome.html -share/samba/swat/lang/ja/include/footer.html -share/samba/swat/lang/ja/include/header.html -share/samba/swat/lang/ja/include/header.nocss.html -share/samba/swat/lang/ja/include/header_css.html share/samba/swat/lang/tr/help/welcome.html share/samba/swat/lang/tr/images/globals.gif share/samba/swat/lang/tr/images/home.gif @@ -383,7 +381,6 @@ share/samba/swat/lang/tr/images/samba.gif share/samba/swat/lang/tr/images/shares.gif share/samba/swat/lang/tr/images/status.gif share/samba/swat/lang/tr/images/viewconfig.gif -share/samba/swat/lang/tr/include/header.html share/samba/swat/using_samba/appa.html share/samba/swat/using_samba/appb.html share/samba/swat/using_samba/appc.html diff --git a/net/samba/distinfo b/net/samba/distinfo index 0d3e663809d..9281252353c 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.36 2004/09/15 08:51:29 adam Exp $ +$NetBSD: distinfo,v 1.36.2.1 2004/11/18 22:25:13 salo Exp $ -SHA1 (samba-3.0.7.tar.gz) = 7eff8b831e49bbed2cebfc368af55715c7abf635 -Size (samba-3.0.7.tar.gz) = 15012667 bytes +SHA1 (samba-3.0.8.tar.gz) = 63b6264a3cd3117c8b820e0bf8c8b2c59c8cb820 +Size (samba-3.0.8.tar.gz) = 15101353 bytes SHA1 (patch-ab) = c5f352a07774b8e2873c2ac3b3de3ba4cb12bf5e SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644 SHA1 (patch-ad) = b75770eb6fc7ff5d26764fced83e26fd6cf153af SHA1 (patch-ae) = cf3a040f04142df534abe54b66156a48697b665d SHA1 (patch-af) = bc0cead8f8350001e5291443821e875bab540fc3 +SHA1 (patch-ag) = cce908577cf4007bb00b15f6dd7eee7d549ac5b0 diff --git a/net/samba/options.mk b/net/samba/options.mk index 146f78a45b1..a235b5e4e95 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2004/09/12 05:00:53 jlam Exp $ +# $NetBSD: options.mk,v 1.3.2.1 2004/11/18 22:25:13 salo Exp $ # Global and legacy options .if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) @@ -53,8 +53,10 @@ CONFIGURE_ARGS+= --without-krb5 .if !empty(PKG_OPTIONS:Mcups) . include "../../print/cups/buildlink3.mk" CONFIGURE_ARGS+= --enable-cups +PLIST_SUBST+= CUPS= .else CONFIGURE_ARGS+= --disable-cups +PLIST_SUBST+= CUPS="@comment " .endif ### diff --git a/net/samba/patches/patch-ag b/net/samba/patches/patch-ag new file mode 100644 index 00000000000..fa58c27538a --- /dev/null +++ b/net/samba/patches/patch-ag @@ -0,0 +1,54 @@ +$NetBSD: patch-ag,v 1.3.6.1 2004/11/18 22:25:13 salo Exp $ + +--- passdb/passdb.c.orig 2004-08-19 09:39:13.000000000 -0400 ++++ passdb/passdb.c 2004-10-28 00:22:15.000000000 -0400 +@@ -246,6 +246,11 @@ + NTSTATUS pdb_fill_sam_pw(SAM_ACCOUNT *sam_account, const struct passwd *pwd) + { + NTSTATUS ret; ++#ifdef BSD ++# define BUFLEN 1024 ++ char *bp, *gecos, *p, buf[BUFLEN]; ++ int buflen; ++#endif + + if (!pwd) { + return NT_STATUS_UNSUCCESSFUL; +@@ -254,7 +259,37 @@ + pdb_fill_default_sam(sam_account); + + pdb_set_username(sam_account, pwd->pw_name, PDB_SET); ++ ++#ifdef BSD ++ gecos = pwd->pw_gecos; ++ if (*gecos == '*') ++ gecos++; ++ bp = buf; ++ ++ /* copy gecos, interpolating & to be full name */ ++ for (p = gecos; *p != '\0'; p++) { ++ if (bp >= &buf[BUFLEN - 1]) { ++ /* buffer overflow */ ++ gecos = pwd->pw_name; ++ goto gecos_done; ++ } ++ if (*p == '&') { ++ /* interpolate full name */ ++ snprintf(bp, BUFLEN - (bp - buf), "%s", pwd->pw_name); ++ *bp = toupper(*bp); ++ bp += strlen(bp); ++ } ++ else ++ *bp++ = *p; ++ } ++ *bp = '\0'; ++ gecos = buf; ++ ++ gecos_done: ++ pdb_set_fullname(sam_account, gecos, PDB_SET); ++#else + pdb_set_fullname(sam_account, pwd->pw_gecos, PDB_SET); ++#endif + + pdb_set_unix_homedir(sam_account, pwd->pw_dir, PDB_SET); + |