diff options
author | taca <taca@pkgsrc.org> | 2003-03-29 08:18:44 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2003-03-29 08:18:44 +0000 |
commit | e4050b2e0286de6e69e0be7383433e7210f0fbb7 (patch) | |
tree | 2f2b9b5cc863f84f2b02e83078335747222338fe | |
parent | 9dd37e1f795e559c32bc824d91183fe85dbedddc (diff) | |
download | pkgsrc-e4050b2e0286de6e69e0be7383433e7210f0fbb7.tar.gz |
Update ja-samba package to ja-samba-2.2.7.1.1.1 (samba 2.2.7a-1.1).
This contains security problem solved by samba 2.2.8.
pkgsrc changes:
o pkgsrc organization changesd as samba package.
o note explicitly security problem fixed by samba 2.2.8.
o remove own quota support patch.
Changes from ja-samba-2.2.4.1.0 package:
Changelog of Samba2.2 Japanese Edition
Samba Users Group Japan
Here is the fix list of Samba2.2 Japanese Edition.
The sign of each line means:
*: Fix of Samba Japanese Edition only
x: Fix of sending a patch to Samba Team
c: Fix of being commited a patch by Samba Team
samba-2.2.7a-ja-1.1
~~~~~~~~~~~~~~~~~~~
Changes to the original version
c Fixed two security problems which is fixed at samba 2.2.8
[sugj-tech:5211]
samba-2.2.7a-ja-1.0beta1
~~~~~~~~~~~~~~~~~~~~~~~
Changes to the internationalized version
* Fixed build problem when gettext 0.11.x installed [sugj-tech:5177]
* Fixed memory leak of winbindd [sugj-tech:5152]
* Added 'ldap referrals' parameter [sugj-tech:5124]
* Fixed parameter of 'printing' was set on FreeBSD [sugj-tech:5155]
* Fixed reseting parameters of smbd and nmbd by SIGHUP
[sugj-tech:5160]
* Fixed setting change of the 'printing' parameter works together
with print-related parameters [sugj-tech:5155]
* Fixed error message when old getgroups() is used [sugj-tech:5166]
* Fixed warning message when leap second is set [sugj-tech:5166]
* Fixed altname command of smbclient [sugj-tech:5019]
* Fixed close share command of smbcontrol with Japanese
[sugj-tech:5014]
* Fixed compile problem on Tru64 UNIX [sugj-tech:5033]
* Fixed compile problem of tdb directory [sugj-tech:5033]
* Fixed to enable domain logon to Japanese domain name
[sugj-tech:5043]
* Fixed smbspool command with Japanese [sugj-tech:5048,5112]
* Fixed recycle.c of VFS module [samba-jp:13590]
* Fixed memory allocation of make_printerdef [sugj-tech:5106]
* Fixed compile problem before FreeBSD 2.2.8 [sugj-tech:5112]
* Fixed querydispinfo command of rpcclient [sugj-tech:5112]
* Fixed rpcclient for Japanese resource [sugj-tech:5112]
* Changed option of client tools from '-t' to '-T' [sugj-tech:5077]
* Update smbchartool and removed jcode.pl [sugj-tech:5091]
* Fixed encoding when using euc3 coding system [sugj-tech:5122]
samba-2.2.5-ja-1.0beta3
~~~~~~~~~~~~~~~~~~~~~~~
Changes to the internationalized version
* Added %j macro which means printing job name [sugj-tech:4998]
Changes to the original version
* Fixed counting characters of unistr_to_dos() [sugj-tech:5004]
* Fixed compile problem with --with-quotas on NetBSD [sugj-tech:4965]
-rw-r--r-- | net/ja-samba/MESSAGE.security | 9 | ||||
-rw-r--r-- | net/ja-samba/Makefile | 73 | ||||
-rw-r--r-- | net/ja-samba/Makefile.common | 60 | ||||
-rw-r--r-- | net/ja-samba/PLIST | 71 | ||||
-rw-r--r-- | net/ja-samba/distinfo | 16 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-aa | 38 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ab | 15 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ac | 62 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ai | 10 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ao | 57 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-ap | 56 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-aq | 16 | ||||
-rw-r--r-- | net/ja-samba/patches/patch-bd | 69 |
13 files changed, 392 insertions, 160 deletions
diff --git a/net/ja-samba/MESSAGE.security b/net/ja-samba/MESSAGE.security new file mode 100644 index 00000000000..21b2ab974ea --- /dev/null +++ b/net/ja-samba/MESSAGE.security @@ -0,0 +1,9 @@ +=========================================================================== +$NetBSD: MESSAGE.security,v 1.1 2003/03/29 08:18:44 taca Exp $ + + *===* ADDITIONAL SECURITY NOTES *===* + +ja-samba-2.2.7.1.1.1 already contains fixes for two security problems +which are solved by samba 2.2.8. + +=========================================================================== diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index ca0bf0cf92d..e72fd1cf38a 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,73 +1,37 @@ -# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:51 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2003/03/29 08:18:45 taca Exp $ -DISTNAME= samba-${SAMBA_BASE_VERSION}-ja-${SAMBA_JA_VERSION} -PKGNAME= ja-samba-${SAMBA_BASE_VERSION}.${SAMBA_JA_VERSION} -WRKSRC= ${WRKDIR}/${DISTNAME}/source +.include "Makefile.common" + +PKGNAME= ja-samba-${SAMBA_BASE_VERS:S/a/.1/}.${SAMBA_JA_VERS} CATEGORIES= net -MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/samba-${SAMBA_BASE_VERSION}-ja/ \ - ftp://ring.asahi-net.or.jp/pub/net/samba-jp/samba-${SAMBA_BASE_VERSION}-ja/ -EXTRACT_SUFX= .tar.bz2 MAINTAINER= tech-pkg-ja@jp.netbsd.org HOMEPAGE= http://www.jp.samba.org/project/samba-ja/index.html.en COMMENT= Samba supporting I18N swat and L10N for Japanese -SAMBA_BASE_VERSION= 2.2.4 -SAMBA_JA_VERSION= 1.0 CONFLICTS+= samba-[0-9]* -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig - USE_BUILDLINK2= YES USE_PKGINSTALL= YES -USE_PKGLOCALEDIR= YES -USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline -.include "../../mk/bsd.prefs.mk" - -PKG_SYSCONFSUBDIR?= samba - -VARDIR?= /var -SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} -SAMBA_DATADIR= ${PREFIX}/share -SAMBA_LOCKDIR?= ${VARDIR}/db/samba -SAMBA_LOGDIR?= ${VARDIR}/log -SAMBA_PIDDIR?= ${VARDIR}/run -SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private - -CONFIGURE_ARGS+= --localstatedir=${VARDIR} -CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin -CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} -CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_DATADIR}/samba/codepages -CONFIGURE_ARGS+= --with-datadir=${SAMBA_DATADIR} -CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} -CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} -CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} -CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} -CONFIGURE_ARGS+= --with-swatdir=${SAMBA_DATADIR}/samba/swat +USE_PKGLOCALEDIR= YES +USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline CONFIGURE_ARGS+= --with-readline + CONFIGURE_ARGS+= --with-ssl CONFIGURE_ARGS+= --with-sslinc=${SSLBASE} CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h -CONFIGURE_ARGS+= --with-i18n-swat - # Force the use of the included gettext library this doesn't seem to link # with the gettext-lib package. # CONFIGURE_ARGS+= --with-included-gettext -CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no - .if defined(USE_CUPS) && (${USE_CUPS} == "YES") . include "../../print/cups/buildlink2.mk" BUILD_DEFS+= USE_CUPS CONFIGURE_ARGS+= --enable-cups -.else -CONFIGURE_ARGS+= --disable-cups .endif .if defined(USE_PAM) @@ -83,36 +47,31 @@ CONFIGURE_ARGS+= --with-ldapsam PLIST_SUBST+= SAMBA_LDAP="" .else PLIST_SUBST+= SAMBA_LDAP="@comment " -MESSAGE_SRC= ${.CURDIR}/MESSAGE.smbpasswd +MESSAGE_SRC= ${.CURDIR}/MESSAGE.smbpasswd \ + ${.CURDIR}/MESSAGE.security SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \ ${ROOT_USER} ${ROOT_GROUP} 0600 .endif -# The following are Linux-only options. -CONFIGURE_ARGS+= --without-smbwrapper -CONFIGURE_ARGS+= --without-smbmount +# Microsoft DFS support +CONFIGURE_ARGS+= --with-msdfs -# Explicitly disable winbind until it may be properly handled by pkgsrc. -CONFIGURE_ARGS+= --without-winbind +MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} +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 -FILES_SUBST= SAMBA_PRIVATE=${SAMBA_PRIVATE} -FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} -FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} -FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR} -MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} -MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP} -MESSAGE_SUBST+= ROOT_USER=${ROOT_USER} - CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE} 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 + # Remove irrelevant files for this package. post-extract: ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \ diff --git a/net/ja-samba/Makefile.common b/net/ja-samba/Makefile.common new file mode 100644 index 00000000000..f57dae6a63e --- /dev/null +++ b/net/ja-samba/Makefile.common @@ -0,0 +1,60 @@ +# $NetBSD: Makefile.common,v 1.1 2003/03/29 08:18:46 taca Exp $ + +DISTNAME= samba-${SAMBA_BASE_VERS}-ja-${SAMBA_JA_VERS} +SAMBA_BASE_VERS= 2.2.7a +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/ \ + ftp://ring.asahi-net.or.jp/pub/net/samba-jp/samba-${SAMBA_BASE_VERS}-ja/ +EXTRACT_SUFX= .tar.bz2 + +DISTINFO_FILE?= ${.CURDIR}/../../net/ja-samba/distinfo +PATCHDIR?= ${.CURDIR}/../../net/ja-samba/patches + +GNU_CONFIGURE= # defined +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig + +.include "../../mk/bsd.prefs.mk" + +PKG_SYSCONFSUBDIR?= samba + +VARDIR?= /var +SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} +SAMBA_DATADIR= ${PREFIX}/share +SAMBA_LOCKDIR?= ${VARDIR}/db/samba +SAMBA_LOGDIR?= ${VARDIR}/log +SAMBA_PIDDIR?= ${VARDIR}/run +SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private + +CONFIGURE_ARGS+= --localstatedir=${VARDIR} +CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} +CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_DATADIR}/samba/codepages +CONFIGURE_ARGS+= --with-datadir=${SAMBA_DATADIR} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} +CONFIGURE_ARGS+= --with-swatdir=${SAMBA_DATADIR}/samba/swat + +CONFIGURE_ARGS+= --without-readline +CONFIGURE_ARGS+= --without-ssl + +CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no + +CONFIGURE_ARGS+= --disable-cups +CONFIGURE_ARGS+= --without-pam +CONFIGURE_ARGS+= --without-winbind + +CONFIGURE_ARGS+= --with-i18n-swat + +# The following are Linux-only options. +CONFIGURE_ARGS+= --without-smbwrapper +CONFIGURE_ARGS+= --without-smbmount + +FILES_SUBST= SAMBA_PRIVATE=${SAMBA_PRIVATE} +FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} +FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} +FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR} diff --git a/net/ja-samba/PLIST b/net/ja-samba/PLIST index f6c36f14fc3..16b30799fb2 100644 --- a/net/ja-samba/PLIST +++ b/net/ja-samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/07/07 14:36:41 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/03/29 08:18:47 taca Exp $ bin/make_nftable bin/make_printerdef bin/make_smbcodepage @@ -99,6 +99,7 @@ share/doc/samba/Application_Serving.txt share/doc/samba/BROWSING-Config.txt share/doc/samba/BROWSING.txt share/doc/samba/BUGS.txt +share/doc/samba/CUPS-PrintingInfo.txt share/doc/samba/DHCP-Server-Configuration.txt share/doc/samba/DIAGNOSIS.txt share/doc/samba/DNIX.txt @@ -123,7 +124,6 @@ share/doc/samba/RoutedNetworks.txt share/doc/samba/SCO.txt share/doc/samba/SMBTAR.notes share/doc/samba/Samba-OpenSSL.txt -share/doc/samba/Solaris-Winbind-HOWTO.txt share/doc/samba/Speed.txt share/doc/samba/Speed2.txt share/doc/samba/Tracing.txt @@ -142,16 +142,50 @@ share/doc/samba/announce share/doc/samba/cifsntdomain.txt share/doc/samba/security_level.txt share/examples/samba/LDAP/README -share/examples/samba/LDAP/export2_smbpasswd.pl share/examples/samba/LDAP/export_smbpasswd.pl -share/examples/samba/LDAP/import2_smbpasswd.pl share/examples/samba/LDAP/import_smbpasswd.pl share/examples/samba/LDAP/ldapchpasswd share/examples/samba/LDAP/ldapsync.pl +share/examples/samba/LDAP/samba-nds.schema share/examples/samba/LDAP/samba-schema-netscapeds4.x share/examples/samba/LDAP/samba-schema-netscapeds5.x share/examples/samba/LDAP/samba-schema.IBMSecureWay share/examples/samba/LDAP/samba.schema +share/examples/samba/LDAP/smbldap-tools/AUTHORS +share/examples/samba/LDAP/smbldap-tools/CONTRIBUTORS +share/examples/samba/LDAP/smbldap-tools/COPYING +share/examples/samba/LDAP/smbldap-tools/ChangeLog +share/examples/samba/LDAP/smbldap-tools/FILES +share/examples/samba/LDAP/smbldap-tools/INFRASTRUCTURE +share/examples/samba/LDAP/smbldap-tools/INSTALL +share/examples/samba/LDAP/smbldap-tools/Makefile +share/examples/samba/LDAP/smbldap-tools/NEWS +share/examples/samba/LDAP/smbldap-tools/README +share/examples/samba/LDAP/smbldap-tools/TODO +share/examples/samba/LDAP/smbldap-tools/cgi/README +share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi +share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile +share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.c +share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.h +share/examples/samba/LDAP/smbldap-tools/mkntpwd/md4.c +share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.c +share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.h +share/examples/samba/LDAP/smbldap-tools/mkntpwd/smbdes.c +share/examples/samba/LDAP/smbldap-tools/smbldap-groupadd.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-groupshow.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-accounts.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-groups.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-passwd.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-populate.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-tools.spec +share/examples/samba/LDAP/smbldap-tools/smbldap-useradd.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-userdel.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-usermod.pl +share/examples/samba/LDAP/smbldap-tools/smbldap-usershow.pl +share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm +share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm share/examples/samba/README share/examples/samba/misc/convert_smbpasswd share/examples/samba/misc/extra_smbstatus @@ -166,6 +200,7 @@ share/examples/samba/printer-accounting/lp-acct share/examples/samba/printer-accounting/printcap share/examples/samba/printing/smbprint share/examples/samba/printing/smbprint.newer +share/examples/samba/printing/smbprint.old share/examples/samba/printing/smbprint.safer share/examples/samba/printing/smbprint.sysv share/examples/samba/simple/README @@ -187,6 +222,7 @@ ${PKGLOCALEDIR}/locale/en/LC_MESSAGES/samba.mo ${PKGLOCALEDIR}/locale/en/LC_MESSAGES/samba_swat.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/samba.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/samba_swat.mo +share/samba/codepages/codepage.1125 share/samba/codepages/codepage.1251 share/samba/codepages/codepage.437 share/samba/codepages/codepage.737 @@ -200,6 +236,7 @@ share/samba/codepages/codepage.932 share/samba/codepages/codepage.936 share/samba/codepages/codepage.949 share/samba/codepages/codepage.950 +share/samba/codepages/nftable.1125 share/samba/codepages/nftable.1251 share/samba/codepages/nftable.437 share/samba/codepages/nftable.737 @@ -221,6 +258,8 @@ share/samba/codepages/nftable.ISO8859-5 share/samba/codepages/nftable.ISO8859-7 share/samba/codepages/nftable.ISO8859-9 share/samba/codepages/nftable.KOI8-R +share/samba/codepages/nftable.KOI8-U +share/samba/codepages/unicode_map.1125 share/samba/codepages/unicode_map.1251 share/samba/codepages/unicode_map.437 share/samba/codepages/unicode_map.737 @@ -242,6 +281,7 @@ share/samba/codepages/unicode_map.ISO8859-5 share/samba/codepages/unicode_map.ISO8859-7 share/samba/codepages/unicode_map.ISO8859-9 share/samba/codepages/unicode_map.KOI8-R +share/samba/codepages/unicode_map.KOI8-U share/samba/swat/help/CVS-Access.html share/samba/swat/help/DOMAIN_MEMBER.html share/samba/swat/help/ENCRYPTION.html @@ -254,6 +294,7 @@ share/samba/swat/help/Samba-HOWTO-Collection.html share/samba/swat/help/Samba-LDAP-HOWTO.html share/samba/swat/help/Samba-PDC-HOWTO.html share/samba/swat/help/UNIX_INSTALL.html +share/samba/swat/help/cups.html share/samba/swat/help/findsmb.1.html share/samba/swat/help/lmhosts.5.html share/samba/swat/help/make_smbcodepage.1.html @@ -294,6 +335,7 @@ share/samba/swat/images/samba.gif share/samba/swat/images/shares.gif share/samba/swat/images/status.gif share/samba/swat/images/viewconfig.gif +share/samba/swat/images/wizard.gif share/samba/swat/include/footer.html share/samba/swat/include/header.html share/samba/swat/ja/help/Application_Serving.txt.html @@ -303,22 +345,21 @@ share/samba/swat/ja/help/BrowsingFAQ/browsing01.html share/samba/swat/ja/help/BrowsingFAQ/browsing02.html share/samba/swat/ja/help/BrowsingFAQ/fig_1.html share/samba/swat/ja/help/BrowsingFAQ/fig_2.html -share/samba/swat/ja/help/BrowsingFAQ/fig_4.html -share/samba/swat/ja/help/BrowsingFAQ/fig_5.html -share/samba/swat/ja/help/BrowsingFAQ/fig_6.html -share/samba/swat/ja/help/BrowsingFAQ/fig_7.html -share/samba/swat/ja/help/BrowsingFAQ/fig_8.html share/samba/swat/ja/help/BrowsingFAQ/image/fig1.png share/samba/swat/ja/help/BrowsingFAQ/image/fig2.png -share/samba/swat/ja/help/BrowsingFAQ/image/fig4s.png -share/samba/swat/ja/help/BrowsingFAQ/image/fig5s.png -share/samba/swat/ja/help/BrowsingFAQ/image/fig7s.png -share/samba/swat/ja/help/BrowsingFAQ/image/fig8s.png +share/samba/swat/ja/help/BrowsingFAQ/image/fig4.gif +share/samba/swat/ja/help/BrowsingFAQ/image/fig5.gif +share/samba/swat/ja/help/BrowsingFAQ/image/fig6.gif +share/samba/swat/ja/help/BrowsingFAQ/image/fig7.gif +share/samba/swat/ja/help/BrowsingFAQ/image/fig8.gif +share/samba/swat/ja/help/BrowsingFAQ/image/return.png share/samba/swat/ja/help/BrowsingFAQ/index.html share/samba/swat/ja/help/CRLF-LF-Conversions.txt.html +share/samba/swat/ja/help/CVS-Access.html share/samba/swat/ja/help/CVS_ACCESS.txt.html share/samba/swat/ja/help/DIAGNOSIS.txt.html share/samba/swat/ja/help/DOMAIN.txt.html +share/samba/swat/ja/help/DOMAIN_MEMBER.html share/samba/swat/ja/help/DOMAIN_MEMBER.txt.html share/samba/swat/ja/help/ENCRYPTION.txt.html share/samba/swat/ja/help/File-Cacheing.txt.html @@ -502,6 +543,7 @@ share/samba/swat/ja/images/samba.gif share/samba/swat/ja/images/shares.gif share/samba/swat/ja/images/status.gif share/samba/swat/ja/images/viewconfig.gif +share/samba/swat/ja/images/wizard.gif share/samba/swat/ja/include/footer.html share/samba/swat/ja/include/header.JP1.html share/samba/swat/ja/include/header.html @@ -831,6 +873,9 @@ 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 +@dirrm share/examples/samba/LDAP/smbldap-tools @dirrm share/examples/samba/LDAP @dirrm share/examples/samba/misc @dirrm share/examples/samba/printer-accounting diff --git a/net/ja-samba/distinfo b/net/ja-samba/distinfo index 4b137b6eded..1af380a8f25 100644 --- a/net/ja-samba/distinfo +++ b/net/ja-samba/distinfo @@ -1,12 +1,16 @@ -$NetBSD: distinfo,v 1.4 2002/07/07 14:36:41 taca Exp $ +$NetBSD: distinfo,v 1.5 2003/03/29 08:18:47 taca Exp $ -SHA1 (samba-2.2.4-ja-1.0.tar.bz2) = 70b49ad277ed8ad4b5444fd9f6ec3be4616e6273 -Size (samba-2.2.4-ja-1.0.tar.bz2) = 7093819 bytes -SHA1 (patch-aa) = 18edc5479d6c0b1e552594b5754a4df741c3e25d +SHA1 (samba-2.2.7a-ja-1.1.tar.bz2) = 7555ad9055a5c2e19f7506138713ade174d26816 +Size (samba-2.2.7a-ja-1.1.tar.bz2) = 7307743 bytes +SHA1 (patch-aa) = 8203fd9ebfa835eb9d866cb228cd007b0d4d2b07 +SHA1 (patch-ab) = 94918890889671309f7161e68311bf960f33df0e +SHA1 (patch-ac) = 6f37a1d40ce40621f5f98d7fa501614dd9776b3d SHA1 (patch-ad) = 6ecafde897991512af7ba1038d91278b83453008 -SHA1 (patch-ai) = 6e9869efb1cdd4a683628b4d26228319ea224a2e +SHA1 (patch-ai) = f29a725a65d8fff435bcef64c29acd4066101f83 SHA1 (patch-ak) = 24046b0ce52854f676015a5e25c9ffd23424efe4 SHA1 (patch-al) = e7caad8f6743537469866f9b47b0044ec95852ad SHA1 (patch-am) = 92aa5e122529a30e05199cbe26620b3ac01adbc5 SHA1 (patch-an) = 55c7f9785c19d84b8ad74bbf0827162b156e2327 -SHA1 (patch-bd) = ce538d019d08f4ea8b1b74bdff7b4462da546429 +SHA1 (patch-ao) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41 +SHA1 (patch-ap) = 86ecca1ff90f23e9ccfc7da63a76950146e165b1 +SHA1 (patch-aq) = e5b442fb7eb837bb2771ac71c73e6f95ae6fdfc2 diff --git a/net/ja-samba/patches/patch-aa b/net/ja-samba/patches/patch-aa index 5318ad59b78..daab8de6ae3 100644 --- a/net/ja-samba/patches/patch-aa +++ b/net/ja-samba/patches/patch-aa @@ -1,13 +1,31 @@ -$NetBSD: patch-aa,v 1.2 2002/07/07 14:36:42 taca Exp $ +$NetBSD: patch-aa,v 1.3 2003/03/29 08:18:48 taca Exp $ ---- Makefile.in.orig Fri Jun 21 10:28:27 2002 +--- Makefile.in.orig 2002-11-21 22:08:20.000000000 +0900 +++ Makefile.in -@@ -52,7 +52,7 @@ - CONFIGFILE = $(CONFIGDIR)/smb.conf - LMHOSTSFILE = $(CONFIGDIR)/lmhosts - DRIVERFILE = $(CONFIGDIR)/printers.def --PASSWD_PROGRAM = /bin/passwd -+PASSWD_PROGRAM = /usr/bin/passwd - # This is where smbpasswd et al go - PRIVATEDIR = @privatedir@ +@@ -99,6 +99,8 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $ + FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) + FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) ++PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@ ++ + WINBIND_PROGS = @WINBIND_TARGETS@ + WINBIND_SPROGS = @WINBIND_STARGETS@ + WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@ +@@ -672,7 +674,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) \ + @SONAMEFLAG@`basename $@` + + nsswitch/libnss_wins.@SHLIBEXT@: $(NSS_OBJ) +@@ -696,7 +698,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) \ + @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 new file mode 100644 index 00000000000..4b21ec1599b --- /dev/null +++ b/net/ja-samba/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.3 2003/03/29 08:18:48 taca Exp $ + +--- configure.in.orig 2003-02-05 15:14:44.000000000 +0900 ++++ configure.in +@@ -2060,6 +2060,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)]) + ++dnl Checks for libraries. ++AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc) ++AC_SUBST(PAM_NEEDS_LIBC) ++ + ################################################# + # check for pam_smbpass support + AC_MSG_CHECKING(whether to use pam_smbpass) diff --git a/net/ja-samba/patches/patch-ac b/net/ja-samba/patches/patch-ac new file mode 100644 index 00000000000..b1369f862d2 --- /dev/null +++ b/net/ja-samba/patches/patch-ac @@ -0,0 +1,62 @@ +$NetBSD: patch-ac,v 1.3 2003/03/29 08:18:49 taca Exp $ + +--- configure.orig 2003-02-12 16:00:58.000000000 +0900 ++++ configure +@@ -20306,6 +20306,49 @@ _ACEOF + fi + + ++echo $ac_n "checking for __libc_sched_setscheduler in -lc""... $ac_c" 1>&6 ++echo "configure:11950: checking for __libc_sched_setscheduler in -lc" >&5 ++ac_lib_var=`echo c'_'__libc_sched_setscheduler | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lc $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 11958 "configure" ++#include "confdefs.h" ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __libc_sched_setscheduler(); ++ ++int main() { ++__libc_sched_setscheduler() ++; return 0; } ++EOF ++if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ PAM_NEEDS_LIBC= ++else ++ echo "$ac_t""no" 1>&6 ++PAM_NEEDS_LIBC=-lc ++fi ++ ++ ++ + ################################################# + # check for pam_smbpass support + echo "$as_me:$LINENO: checking whether to use pam_smbpass" >&5 +@@ -26356,6 +26399,7 @@ s,@TERMLIBS@,$TERMLIBS,;t t + s,@TERMLDFLAGS@,$TERMLDFLAGS,;t t + s,@ROFF@,$ROFF,;t t + s,@DYNEXP@,$DYNEXP,;t t ++s%@PAM_NEEDS_LIBC@%$PAM_NEEDS_LIBC%g + s,@LDAPLIBS@,$LDAPLIBS,;t t + s,@QUOTAOBJS@,$QUOTAOBJS,;t t + s,@WINBIND_TARGETS@,$WINBIND_TARGETS,;t t diff --git a/net/ja-samba/patches/patch-ai b/net/ja-samba/patches/patch-ai index 61b75a23d8f..fa54354105e 100644 --- a/net/ja-samba/patches/patch-ai +++ b/net/ja-samba/patches/patch-ai @@ -1,13 +1,13 @@ -$NetBSD: patch-ai,v 1.2 2002/07/07 14:36:45 taca Exp $ +$NetBSD: patch-ai,v 1.3 2003/03/29 08:18:49 taca Exp $ ---- profile/profile.c.orig Fri Jun 7 20:08:25 2002 +--- profile/profile.c.orig 2002-11-21 21:23:08.000000000 +0900 +++ profile/profile.c -@@ -22,7 +22,7 @@ - +@@ -23,7 +23,7 @@ #include "includes.h" + #ifdef WITH_PROFILE -#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6)) +#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH) - static int shm_id; static BOOL read_only; + diff --git a/net/ja-samba/patches/patch-ao b/net/ja-samba/patches/patch-ao new file mode 100644 index 00000000000..e7f689dbd87 --- /dev/null +++ b/net/ja-samba/patches/patch-ao @@ -0,0 +1,57 @@ +$NetBSD: patch-ao,v 1.1 2003/03/29 08:18:50 taca Exp $ + +Expand & in the gecos field to a capitalized login name. + +--- lib/util_getent.c.orig Sat Feb 2 19:46:42 2002 ++++ lib/util_getent.c Sun Oct 13 21:37:56 2002 +@@ -155,6 +155,11 @@ + struct sys_pwent *plist; + struct sys_pwent *pent; + struct passwd *pwd; ++#ifdef BSD ++# define BUFLEN 1024 ++ char *bp, *gecos, *p, buf[BUFLEN]; ++ int buflen; ++#endif + + pent = (struct sys_pwent *) malloc(sizeof(struct sys_pwent)); + if (pent == NULL) { +@@ -178,9 +183,38 @@ + pent->pw_uid = pwd->pw_uid; + pent->pw_gid = pwd->pw_gid; + if (pwd->pw_gecos) { ++#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 */ ++ 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'; ++ if ((pent->pw_name = strdup(buf)) == NULL) ++ goto err; ++#else + if ((pent->pw_name = strdup(pwd->pw_gecos)) == NULL) + goto err; ++#endif + } ++#ifdef BSD ++ gecos_done: ++#endif + if (pwd->pw_dir) { + if ((pent->pw_name = strdup(pwd->pw_dir)) == NULL) + goto err; diff --git a/net/ja-samba/patches/patch-ap b/net/ja-samba/patches/patch-ap new file mode 100644 index 00000000000..26d037e8f9c --- /dev/null +++ b/net/ja-samba/patches/patch-ap @@ -0,0 +1,56 @@ +$NetBSD: patch-ap,v 1.1 2003/03/29 08:18:50 taca Exp $ + +Expand & in the gecos field to a capitalized login name. + +--- lib/system.c.orig 2003-02-05 15:14:52.000000000 +0900 ++++ lib/system.c +@@ -776,6 +776,11 @@ static int num_lookups; /* Counter so we + + static void copy_pwent(struct saved_pw *dst, struct passwd *pass) + { ++#ifdef BSD ++ char *bp, *gecos, *p, buf[PSTRING_LEN]; ++ int buflen; ++#endif ++ + memcpy((char *)&dst->pass, pass, sizeof(struct passwd)); + + unix_to_dos(dst->pw_name, pass->pw_name); +@@ -784,7 +789,37 @@ static void copy_pwent(struct saved_pw * + fstrcpy(dst->pw_passwd, pass->pw_passwd); + dst->pass.pw_passwd = dst->pw_passwd; + ++#ifdef BSD ++ unix_to_dos(gecos, pass->pw_gecos); ++ if (*gecos == '*') ++ gecos++; ++ bp = buf; ++ ++ /* copy gecos, interpolating & to be full name */ ++ for (p = gecos; *p != '\0'; p++) { ++ if (bp >= &buf[PSTRING_LEN - 1]) { ++ /* buffer overflow */ ++ gecos = pass->pw_name; ++ goto gecos_done; ++ } ++ if (*p == '&') { ++ /* interpolate full name */ ++ snprintf(bp, PSTRING_LEN - (bp - buf), "%s", ++ pass->pw_name); ++ *bp = toupper(*bp); ++ bp += strlen(bp); ++ } ++ else ++ *bp++ = *p; ++ } ++ *bp = '\0'; ++ gecos = buf; ++ ++ gecos_done: ++ fstrcpy(dst->pw_gecos, gecos); ++#else + unix_to_dos(dst->pw_gecos, pass->pw_gecos); ++#endif + dst->pass.pw_gecos = dst->pw_gecos; + + unix_to_dos(dst->pw_dir, pass->pw_dir); diff --git a/net/ja-samba/patches/patch-aq b/net/ja-samba/patches/patch-aq new file mode 100644 index 00000000000..a7a6bd80821 --- /dev/null +++ b/net/ja-samba/patches/patch-aq @@ -0,0 +1,16 @@ +$NetBSD: patch-aq,v 1.1 2003/03/29 08:18:51 taca Exp $ + +--- smbd/open.c.orig Fri Feb 28 15:56:20 2003 ++++ smbd/open.c Sun Mar 16 09:03:17 2003 +@@ -979,8 +979,11 @@ + fsp_open = open_file(fsp,conn,fname,psbuf,flags|flags2,mode,desired_access); + + if (!fsp_open && (flags == O_RDWR) && (errno != ENOENT) && fcbopen) { ++ int saved_errno = errno; + if((fsp_open = open_file(fsp,conn,fname,psbuf,O_RDONLY,mode,desired_access)) == True) + flags = O_RDONLY; ++ else ++ errno = saved_errno; + } + + if (!fsp_open) { diff --git a/net/ja-samba/patches/patch-bd b/net/ja-samba/patches/patch-bd deleted file mode 100644 index 2ac37290771..00000000000 --- a/net/ja-samba/patches/patch-bd +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2002/07/07 14:36:48 taca Exp $ - ---- smbd/quotas.c.orig Fri Jun 7 20:09:06 2002 -+++ smbd/quotas.c -@@ -855,7 +855,7 @@ - - #else - --#if defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - #include <ufs/ufs/quota.h> - #include <machine/param.h> - #elif AIX -@@ -865,7 +865,7 @@ - #define dqb_curfiles dqb_curinodes - #define dqb_fhardlimit dqb_ihardlimit - #define dqb_fsoftlimit dqb_isoftlimit --#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ -+#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */ - #include <sys/quota.h> - #include <devnm.h> - #endif -@@ -879,7 +879,7 @@ - int r; - struct dqblk D; - uid_t euser_id; --#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) -+#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) && !defined(__NetBSD__) - char dev_disk[256]; - SMB_STRUCT_STAT S; - /* find the block device file */ -@@ -898,7 +898,7 @@ - - restore_re_uid(); - #else --#if defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - { - /* FreeBSD patches from Marty Moll <martym@arbor.edu> */ - gid_t egrp_id; -@@ -923,15 +923,15 @@ - r= quotactl(path,QCMD(Q_GETQUOTA,USRQUOTA),euser_id,(char *) &D); - #else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ - r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D); --#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ -+#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */ - #endif /* HPUX */ - - /* Use softlimit to determine disk space, except when it has been exceeded */ --#if defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - *bsize = DEV_BSIZE; --#else /* !__FreeBSD__ && !__OpenBSD__ */ -+#else /* !__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */ - *bsize = 1024; --#endif /*!__FreeBSD__ && !__OpenBSD__ */ -+#endif /*!__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */ - - if (r) - { -@@ -954,7 +954,7 @@ - return(False); - /* Use softlimit to determine disk space, except when it has been exceeded */ - if ((D.dqb_curblocks>D.dqb_bsoftlimit) --#if !defined(__FreeBSD__) && !defined(__OpenBSD__) -+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) - ||((D.dqb_curfiles>D.dqb_fsoftlimit) && (D.dqb_fsoftlimit != 0)) - #endif - ) { |