pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/ja-samba Update ja-samba package to 2.2.9.1.0 (sam...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4523c4228e7f
branches: trunk
changeset: 476222:4523c4228e7f
user: taca <taca%pkgsrc.org@localhost>
date: Sat Jun 05 13:16:35 2004 +0000
description:
Update ja-samba package to 2.2.9.1.0 (samba-2.2.9-ja-1.0).
- Introduce adduser/deluser script from samba2 package.
- Here is changes:
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
o: Fix of adopting a patch created by Samba team
samba-2.2.8a-ja-1.2alpha3
~~~~~~~~~~~~~~~~~~~~~~~~~
o Fixed oplocks problem for Linux kernel 2.4 or later
[sugj-tech:6096]
samba-2.2.8a-ja-1.2alpha2
~~~~~~~~~~~~~~~~~~~~~~~~~
Changes to the internationalized version
* Support Kerberos V not only for FreeBSD [sugj-tech:6030]
* Adjust some directory specifications for RPM [sugj-tech:6029]
* Fixed unavailable winbind auth problem on FreeBSD [sugj-tech:6049]
* Fixed smbwrapper.64.so problem for 64bit Solaris [sugj-tech:6048]
Changes to the original version
* Suppressed abortion in some commands when resolve order is specified
[sugj-tech:6031]
* Fixed unchangeable password problem when Samba is PDC for BSDish OS
[sugj-tech:6073]
samba-2.2.8a-ja-1.2alpha1
~~~~~~~~~~~~~~~~~~~~~~~~~
Changes to the internationalized version
* Fixed unavailable Japanese problem for username in username map
[samba-jp:15437]
Changes to the original version
* Fixed build problem with Mac OS X [samba-jp:15461]
* Fixed unaccessable problem in BSD/OS, Mac OS X [samba-jp:15472]
diffstat:
net/ja-samba/Makefile | 28 ++++++-
net/ja-samba/Makefile.common | 9 +-
net/ja-samba/PLIST | 4 +-
net/ja-samba/distinfo | 14 +-
net/ja-samba/files/adduser.sh | 160 ++++++++++++++++++++++++++++++++++++++++++
net/ja-samba/files/deluser.sh | 68 +++++++++++++++++
net/ja-samba/patches/patch-aa | 8 +-
net/ja-samba/patches/patch-ab | 6 +-
net/ja-samba/patches/patch-ac | 14 +-
net/ja-samba/patches/patch-ap | 26 +++---
10 files changed, 295 insertions(+), 42 deletions(-)
diffs (truncated from 501 to 300 lines):
diff -r e13a61e85a1a -r 4523c4228e7f net/ja-samba/Makefile
--- a/net/ja-samba/Makefile Sat Jun 05 12:22:47 2004 +0000
+++ b/net/ja-samba/Makefile Sat Jun 05 13:16:35 2004 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2004/05/05 03:54:59 snj Exp $
+# $NetBSD: Makefile,v 1.26 2004/06/05 13:16:35 taca Exp $
.include "Makefile.common"
-PKGNAME= ja-samba-${SAMBA_BASE_VERS:S/a/.1/}.${SAMBA_JA_VERS}
-PKGREVISION= 3
+PKGNAME= ja-samba-${SAMBA_BASE_VERS}.${SAMBA_JA_VERS}
CATEGORIES= net
MAINTAINER= tech-pkg-ja%jp.NetBSD.org@localhost
@@ -66,10 +65,27 @@
CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE}
+SUPPORT_FILES_PERMS+= ${EXAMPLESDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
+ ${ROOT_USER} ${ROOT_GROUP} 0555
+SUPPORT_FILES_PERMS+= ${EXAMPLESDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \
+ ${ROOT_USER} ${ROOT_GROUP} 0555
RCD_SCRIPTS= samba nmbd smbd
OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
+.if !defined(MKTEMP)
+MKTEMP!= ${TYPE} mktemp 2>&1 | \
+ ${AWK} '/not found/ { print "mktemp"; exit } { print $$3 }'
+MAKEFLAGS+= MKTEMP=${MKTEMP:Q}
+.endif
+.if !defined(PWD_MKDB)
+PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
+ ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
+MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q}
+.endif
+FILES_SUBST+= MKTEMP=${MKTEMP:Q}
+FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
+
REPLACE_PERL= script/findsmb.in
# Remove irrelevant files for this package.
@@ -85,6 +101,10 @@
${RM} -r ${WRKDIR}/${DISTNAME}/examples/smbchartool
${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup
+post-build:
+ @${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh
+ @${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
+
post-install:
# Install Samba documentation.
${INSTALL_DATA_DIR} ${DOCDIR}
@@ -95,6 +115,8 @@
# Install Samba examples.
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+ ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EXAMPLESDIR}/adduser.sh
+ ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EXAMPLESDIR}/deluser.sh
${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
${CHMOD} -R ugo-w ${EXAMPLESDIR}
diff -r e13a61e85a1a -r 4523c4228e7f net/ja-samba/Makefile.common
--- a/net/ja-samba/Makefile.common Sat Jun 05 12:22:47 2004 +0000
+++ b/net/ja-samba/Makefile.common Sat Jun 05 13:16:35 2004 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.common,v 1.4 2003/08/30 01:31:11 taca Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/06/05 13:16:35 taca Exp $
DISTNAME= samba-${SAMBA_BASE_VERS}-ja-${SAMBA_JA_VERS}
-SAMBA_BASE_VERS= 2.2.8a
-SAMBA_JA_VERS= 1.1
+SAMBA_BASE_VERS= 2.2.9
+SAMBA_JA_VERS= 1.0
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/
+ ftp://ftp.ring.gr.jp/pub/net/samba-jp/samba-${SAMBA_BASE_VERS}-ja/ \
+ ftp://ftp.mex.ad.jp/pub/samba-jp/pub/net/samba-jp/samba-${SAMBA_BASE_VERS}-ja/
EXTRACT_SUFX= .tar.bz2
DISTINFO_FILE?= ${.CURDIR}/../../net/ja-samba/distinfo
diff -r e13a61e85a1a -r 4523c4228e7f net/ja-samba/PLIST
--- a/net/ja-samba/PLIST Sat Jun 05 12:22:47 2004 +0000
+++ b/net/ja-samba/PLIST Sat Jun 05 13:16:35 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/23 22:07:56 reed Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/06/05 13:16:35 taca Exp $
bin/findsmb
bin/make_printerdef
bin/make_smbcodepage
@@ -168,6 +168,8 @@
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/adduser.sh
+share/examples/samba/deluser.sh
share/examples/samba/misc/convert_smbpasswd
share/examples/samba/misc/extra_smbstatus
share/examples/samba/misc/modify_samba_config.pl
diff -r e13a61e85a1a -r 4523c4228e7f net/ja-samba/distinfo
--- a/net/ja-samba/distinfo Sat Jun 05 12:22:47 2004 +0000
+++ b/net/ja-samba/distinfo Sat Jun 05 13:16:35 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2003/08/30 01:31:12 taca Exp $
+$NetBSD: distinfo,v 1.13 2004/06/05 13:16:35 taca Exp $
-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 (samba-2.2.9-ja-1.0.tar.bz2) = 982339aaecf4276db0f87e7491c0f4ff039d0d75
+Size (samba-2.2.9-ja-1.0.tar.bz2) = 7474160 bytes
+SHA1 (patch-aa) = 2f553bd640a819e9543d4678c779d5f98a164e3f
+SHA1 (patch-ab) = a2eef891b0a38955f22a9adeec09666d231a541f
+SHA1 (patch-ac) = c1de3af21a4b539236a906c4c072e6db283a2b28
SHA1 (patch-ad) = 358a9218bbe45cc5463a112ff6f2dec1b78da99e
SHA1 (patch-ai) = f29a725a65d8fff435bcef64c29acd4066101f83
SHA1 (patch-ak) = 0e3cbb4ac58a3445224779d72153e2bba5a4b6c2
@@ -12,5 +12,5 @@
SHA1 (patch-am) = 92aa5e122529a30e05199cbe26620b3ac01adbc5
SHA1 (patch-an) = 55c7f9785c19d84b8ad74bbf0827162b156e2327
SHA1 (patch-ao) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41
-SHA1 (patch-ap) = 199e2f8e5f2a5ac5aace21e6ada1fd8887a19059
+SHA1 (patch-ap) = 80d0884d5a38c5efeb26c9657baea73564f0daa9
SHA1 (patch-aq) = 73017f99efd1b4e3d93d8f14e63f0c43e391236d
diff -r e13a61e85a1a -r 4523c4228e7f net/ja-samba/files/adduser.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ja-samba/files/adduser.sh Sat Jun 05 13:16:35 2004 +0000
@@ -0,0 +1,160 @@
+#!/bin/sh
+#
+# $NetBSD: adduser.sh,v 1.1 2004/06/05 13:16:35 taca Exp $
+#
+# This is an adduser script for NetBSD systems whose useradd(8) doesn't
+# accept "$" in the username.
+
+awkprog="@AWK@"
+catprog="@CAT@"
+mktempprog="@MKTEMP@"
+pwdmkdbprog="@PWD_MKDB@"
+rmprog="@RM@"
+
+progname=adduser
+
+usage() {
+ echo "Usage: $progname [-c comment] [-d homedir] [-n] [-r low..high]"
+ echo " [-s shell] -g gid name"
+ exit 1
+}
+
+isnum() {
+ case "$1" in
+ 0[0-9]*|*[!0-9]*)
+ return 1
+ ;;
+ esac
+ return 0
+}
+
+doit=""
+gid=""
+minuid=1000
+maxuid=60000
+comment=""
+homedir=""
+shell=/sbin/nologin
+
+while getopts c:d:g:nr:s: flag; do
+ case $flag in
+ c) comment="${OPTARG}" ;;
+ d) homedir="${OPTARG}" ;;
+ g) gid="${OPTARG}" ;;
+ n) doit=":" ;;
+ r) minuid=${OPTARG%%..*}; maxuid=${OPTARG##*..} ;;
+ s) shell="${OPTARG}" ;;
+ esac
+done
+shift `expr $OPTIND - 1`
+
+if [ $# -lt 1 ]; then
+ usage
+fi
+
+name="$1"
+if [ -z "$gid" ]; then
+ echo "$progname: \`-g gid' is a required option" 1>&2
+ exit 1
+fi
+if ! isnum "$gid"; then
+ echo "$progname: \`$gid' is not a valid gid" 1>&2
+ exit 1
+fi
+if ! isnum "$minuid"; then
+ echo "$progname: \`$minuid' is not a valid minimum uid" 1>&2
+ exit 1
+fi
+if ! isnum "$maxuid"; then
+ echo "$progname: \`$maxuid' is not a valid maximum uid" 1>&2
+ exit 1
+fi
+if [ $minuid -gt $maxuid ]; then
+ echo "$progname: \`$minuid..$maxuid' is not a valid range" 1>&2
+ exit 1
+fi
+case "$comment" in
+*:*)
+ echo "$progname: \`$comment' is not a valid comment" 1>&2
+ exit 1
+ ;;
+esac
+case "$homedir" in
+*:*)
+ echo "$progname: \`$homedir' is not a valid home directory" 1>&2
+ exit 1
+ ;;
+%*)
+ # This is an unsubstituted variable (probably %H in smbd).
+ # Silently change this to a proper default.
+ #
+ homedir="/nonexistent"
+ ;;
+esac
+case "$shell" in
+*:*)
+ echo "$progname: \`$shell' is not a valid shell" 1>&2
+ exit 1
+ ;;
+esac
+case "$name" in
+*:*)
+ echo "$progname: \`$name' is not a valid username" 1>&2
+ exit 1
+ ;;
+esac
+
+ptmp=`$mktempprog -q /etc/ptmp`
+case "$ptmp" in
+/etc/ptmp)
+ ;;
+*)
+ echo "$progname: can't create /etc/ptmp" 1>&2
+ exit 1
+ ;;
+esac
+
+if [ ! -f /etc/master.passwd ]; then
+ echo "$progname: /etc/master.passwd not found" 1>&2
+ $rmprog -f $ptmp
+ exit 1
+fi
+
+$catprog /etc/master.passwd >> $ptmp
+
+uid=` \
+ $awkprog -v minuid=$minuid -v maxuid=maxuid ' \
+ BEGIN { FS = ":" } \
+ { seen_uids[$3] = 1 } \
+ END { \
+ uid = minuid; \
+ while (uid <= maxuid) { \
+ if (uid in seen_uids) { \
+ uid++; \
+ continue; \
+ } \
+ print uid; \
+ exit; \
+ } \
+ print -1; \
+ }' $ptmp \
+`
+if [ $uid -lt 0 ]; then
+ echo "$progname: no uid can be allocated in $minuid..$maxuid" 1>&2
+ $rmprog -f $ptmp
+ exit 1
+fi
+
+case "${name}" in
+*$) : ${comment:=${name%%[$]*} samba machine account} ;;
+*) : ${comment:=${name} samba user} ;;
+esac
+entry="${name}:*:${uid}:${gid}::0:0:${comment}:${homedir}:${shell}"
+
+echo "$entry" >> $ptmp
+
+$doit $pwdmkdbprog -p -u "${name}" $ptmp
+rc=$?
+
+$rmprog -f $ptmp
+exit $rc
diff -r e13a61e85a1a -r 4523c4228e7f net/ja-samba/files/deluser.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ja-samba/files/deluser.sh Sat Jun 05 13:16:35 2004 +0000
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# $NetBSD: deluser.sh,v 1.1 2004/06/05 13:16:35 taca Exp $
Home |
Main Index |
Thread Index |
Old Index