Date: Fri, 1 Mar 2002 21:31:00 +0900 (JST) From: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35452: Maintainer's update: japanese/samba Message-ID: <200203011231.g21CV0U74525@xa12.heimat.gr.jp>
next in thread | raw e-mail | index | archive | help
>Number: 35452
>Category: ports
>Synopsis: Maintainer's update: japanese/samba
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 01 05:00:09 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: NAKAJI Hiroyuki
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD xa12.heimat.gr.jp 5.0-CURRENT FreeBSD 5.0-CURRENT #8: Sat Feb 9 06:41:14 JST 2002 root@xa12.heimat.gr.jp:/usr/obj/usr/src/sys/NAKAJI i386
>Description:
Samba-2.2.2-ja-1.1 was released.
>How-To-Repeat:
>Fix:
Here is a diff from ports-current.
diff -urN -x CVS -x work /usr/ports/japanese/samba/Makefile ./Makefile
--- /usr/ports/japanese/samba/Makefile Sat Jan 19 20:05:28 2002
+++ ./Makefile Mon Feb 25 19:05:51 2002
@@ -22,7 +22,7 @@
BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
SAMBA_VERSION= 2.2.2
-SAMBA_JA_VERSION= 1.0
+SAMBA_JA_VERSION= 1.1
# directories
VARDIR= /var
@@ -89,13 +89,11 @@
fi
@${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
- @${MKDIR} -p -m 500 ${SAMBA_PRIVATE}
+ @${MKDIR} -m 500 ${SAMBA_PRIVATE}
@${CHOWN} root:wheel ${SAMBA_PRIVATE}
- @${CAT} /etc/passwd | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.default
- @if [ ! -e ${SAMBA_PRIVATE}/smbpasswd ]; then \
- ${CP} -p ${SAMBA_PRIVATE}/smbpasswd.default ${SAMBA_PRIVATE}/smbpasswd ; \
- fi
- @${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*
+ @${CAT} /etc/passwd | ${AWK} -F: '$$6 ~ /home/' | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.sample
+ @test -f ${SAMBA_PRIVATE}/smbpasswd || ${TOUCH} ${SAMBA_PRIVATE}/smbpasswd
+ @${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd.sample ${SAMBA_PRIVATE}/smbpasswd
@${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
@${CHMOD} 111 ${PREFIX}/bin/smbpasswd
diff -urN -x CVS -x work /usr/ports/japanese/samba/distinfo ./distinfo
--- /usr/ports/japanese/samba/distinfo Sat Jan 19 20:05:28 2002
+++ ./distinfo Fri Feb 22 15:43:22 2002
@@ -1 +1 @@
-MD5 (samba-2.2.2-ja-1.0.tar.bz2) = 3938d9491e1e904b421b9ee7807fb745
+MD5 (samba-2.2.2-ja-1.1.tar.bz2) = 2ba9e3295715942bb1ee2dc243660747
diff -urN -x CVS -x work /usr/ports/japanese/samba/files/README.FreeBSD ./files/README.FreeBSD
--- /usr/ports/japanese/samba/files/README.FreeBSD Mon Jan 21 11:21:20 2002
+++ ./files/README.FreeBSD Mon Feb 25 18:11:37 2002
@@ -1,6 +1,6 @@
$FreeBSD: ports/japanese/samba/files/README.FreeBSD,v 1.4 2002/01/19 11:05:29 knu Exp $
-If you want to use samba ports,
+If you want to use samba-ja,
1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit
it.
@@ -10,11 +10,13 @@
See document files in /usr/local/share/doc/samba and example config files in
/usr/local/share/examples/samba for details.
-Samba Japanese Edition is based on Samba 2.0.9, implemented the experimental
+Samba Japanese Edition is based on Samba 2.2.2, implemented the experimental
internationalized SWAT and fixed several problems arond functions for
Japanese support. See smb.conf.sample for details. If you want to use
NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
yes and use smbpasswd [username] to use /usr/local/private/smbpasswd
for authentication.
+
+For more information about samba-ja, see http://www.samba.gr.jp/
FreeBSD SAMBA-ja ports maintainer: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
diff -urN -x CVS -x work /usr/ports/japanese/samba/files/patch-aa ./files/patch-aa
--- /usr/ports/japanese/samba/files/patch-aa Mon Jan 21 11:21:20 2002
+++ ./files/patch-aa Wed Feb 20 15:34:11 2002
@@ -1,5 +1,5 @@
---- Makefile.in.orig Tue Oct 30 13:03:01 2001
-+++ Makefile.in Mon Nov 26 10:40:10 2001
+--- Makefile.in.orig Fri Nov 9 20:28:07 2001
++++ Makefile.in Wed Feb 20 11:48:46 2002
@@ -51,7 +51,7 @@
CONFIGFILE = $(CONFIGDIR)/smb.conf
LMHOSTSFILE = $(CONFIGDIR)/lmhosts
diff -urN -x CVS -x work /usr/ports/japanese/samba/files/patch-ak ./files/patch-ak
--- /usr/ports/japanese/samba/files/patch-ak Mon Jan 21 11:21:20 2002
+++ ./files/patch-ak Wed Feb 20 16:00:21 2002
@@ -1,26 +1,17 @@
---- script/installswat.sh.orig Mon Oct 29 14:56:01 2001
-+++ script/installswat.sh Mon Nov 26 11:40:19 2001
-@@ -16,7 +16,7 @@
- langdir=$SWATDIR/$ln
- for d in $SWATDIR $langdir $langdir/help $langdir/images $langdir/include; do
+--- script/installswat.sh.orig Thu Jan 31 16:56:23 2002
++++ script/installswat.sh Wed Feb 20 15:36:18 2002
+@@ -10,7 +10,7 @@
+
+ for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
if [ ! -d $d ]; then
- mkdir $d
+ mkdir -p $d
if [ ! -d $d ]; then
echo Failed to make directory $d, does $USER have privileges?
exit 1
-@@ -83,7 +83,7 @@
-
- for d in $BOOKDIR $BOOKDIR/$ln $BOOKDIR/$ln/figs $BOOKDIR/$ln/gifs; do
- if [ ! -d $d ]; then
-- mkdir $d
-+ mkdir -p $d
- if [ ! -d $d ]; then
- echo Failed to make directory $d, does $USER have privileges?
- exit 1
-@@ -132,7 +132,7 @@
+@@ -69,7 +69,7 @@
- for d in $SWATDIR/$ln/help/HowToUseSamba; do
+ for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do
if [ ! -d $d ]; then
- mkdir $d
+ mkdir -p $d
diff -urN -x CVS -x work /usr/ports/japanese/samba/files/patch-al ./files/patch-al
--- /usr/ports/japanese/samba/files/patch-al Sat Jan 19 20:05:29 2002
+++ ./files/patch-al Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- script/installcp.sh.orig Mon Nov 26 13:40:10 2001
-+++ script/installcp.sh Mon Nov 26 13:40:24 2001
-@@ -12,7 +12,7 @@
- echo Installing codepage files in $CODEPAGEDIR
- for d in $LIBDIR $CODEPAGEDIR; do
- if [ ! -d $d ]; then
--mkdir $d
-+mkdir -p $d
- if [ ! -d $d ]; then
- echo Failed to make directory $d
- exit 1
diff -urN -x CVS -x work /usr/ports/japanese/samba/pkg-message ./pkg-message
--- /usr/ports/japanese/samba/pkg-message Thu Jan 1 09:00:00 1970
+++ ./pkg-message Mon Jan 21 11:20:39 2002
@@ -0,0 +1,8 @@
+WARNING:
+
+The lock directory where browse.dat, wins.dat and other *.tdb files
+are created by smbd and nmbd is changed from /var/spool/lock to
+/var/db/samba.
+
+If you are about to update your japanese/samba from 2.0.10j1.2 to 2.2.2j1.0,
+you need to remove old these files in /var/spool/lock.
diff -urN -x CVS -x work /usr/ports/japanese/samba/pkg-plist ./pkg-plist
--- /usr/ports/japanese/samba/pkg-plist Mon Jan 21 11:21:21 2002
+++ ./pkg-plist Mon Feb 25 18:45:49 2002
@@ -70,7 +70,7 @@
@dirrm etc/codepages
etc/rc.d/samba.sh.sample
etc/smb.conf.default
-private/smbpasswd.default
+private/smbpasswd.sample
sbin/nmbd
sbin/smbd
sbin/swat
@@ -666,7 +666,6 @@
share/doc/samba/ja/yodldocs/smbspool.8.yo
share/doc/samba/ja/yodldocs/smbstatus.1.yo
share/doc/samba/ja/yodldocs/smbtar.1.yo
-share/doc/samba/ja/yodldocs/testprns.1.yo
share/doc/samba/manpages/findsmb.1
share/doc/samba/manpages/ja/Makefile
share/doc/samba/manpages/ja/findsmb.1.man
@@ -1479,7 +1478,6 @@
share/swat/using_samba/ja/this_edition.html
share/swat/using_samba/licenseinfo.html
share/swat/using_samba/this_edition.html
-@dirrm share/swat/ja/help/HowToUseSamba
@dirrm share/swat/ja/help/BrowsingFAQ/image
@dirrm share/swat/ja/help/BrowsingFAQ
@dirrm share/swat/ja/help/HowToUseSamba2.2
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203011231.g21CV0U74525>