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.12.0.9.1 (...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2a0b9c6fe5bc
branches: trunk
changeset: 495754:2a0b9c6fe5bc
user: taca <taca%pkgsrc.org@localhost>
date: Sun Jun 19 18:38:40 2005 +0000
description:
Update ja-samba package to 2.2.12.0.9.1 (2.2.12-ja-1.0beta1).
- Fix security problem up fixed by 2.2.12 and recent problem reported
by CAN-2004-1154.
- pkgsrc changes:
* Overhaul pkgsrc structure (as net/samba).
* Adapt PKG_OPTIONS frame work.
* Add support for winbind (not tested).
* Add SAMBA_USER/SAMBA_GROUP for default user.
* move codepages directory from share/samba to lib/samba.
diffstat:
net/ja-samba/MESSAGE.common | 6 -
net/ja-samba/Makefile | 187 ++++++++++++++++++++++++++++++----------
net/ja-samba/Makefile.common | 61 -------------
net/ja-samba/PLIST | 138 ++++++++++++++++-------------
net/ja-samba/distinfo | 20 ++-
net/ja-samba/files/adduser.sh | 5 +-
net/ja-samba/files/nmbd.sh | 10 +-
net/ja-samba/files/samba.sh | 18 ++-
net/ja-samba/files/smbd.sh | 10 +-
net/ja-samba/files/winbindd.sh | 25 +++++
net/ja-samba/options.mk | 64 ++++++++++++-
net/ja-samba/patches/patch-aa | 66 +++++++++++++-
net/ja-samba/patches/patch-ab | 19 +++-
net/ja-samba/patches/patch-ac | 21 ++++-
net/ja-samba/patches/patch-ao | 18 +-
net/ja-samba/patches/patch-ax | 12 --
net/ja-samba/patches/patch-ay | 12 ++
net/ja-samba/patches/patch-az | 13 ++
net/ja-samba/patches/patch-bh | 39 ++++++++
19 files changed, 502 insertions(+), 242 deletions(-)
diffs (truncated from 1090 to 300 lines):
diff -r dc16aac058b9 -r 2a0b9c6fe5bc net/ja-samba/MESSAGE.common
--- a/net/ja-samba/MESSAGE.common Sun Jun 19 17:40:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.common,v 1.1 2004/08/17 17:32:43 taca Exp $
-
-This package contains the fix by Samba 2.2.11.
-
-===========================================================================
diff -r dc16aac058b9 -r 2a0b9c6fe5bc net/ja-samba/Makefile
--- a/net/ja-samba/Makefile Sun Jun 19 17:40:22 2005 +0000
+++ b/net/ja-samba/Makefile Sun Jun 19 18:38:40 2005 +0000
@@ -1,57 +1,141 @@
-# $NetBSD: Makefile,v 1.35 2005/06/03 22:54:44 jlam Exp $
-
-.include "Makefile.common"
+# $NetBSD: Makefile,v 1.36 2005/06/19 18:38:40 taca Exp $
-PKGNAME= ja-samba-${SAMBA_BASE_VERS}.${SAMBA_JA_VERS}
-PKGREVISION= 1
+DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION}
+PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION}
CATEGORIES= net
+MASTER_SITES= ${JA_SAMBA_MASTER_SITES:S/$/beta\//}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= tech-pkg-ja%jp.NetBSD.org@localhost
HOMEPAGE= http://www.jp.samba.org/project/samba-ja/index.html.en
COMMENT= Samba supporting I18N swat and L10N for Japanese
-CONFLICTS+= samba-[0-9]*
+CONFLICTS+= samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
+WRKSRC?= ${WRKDIR}/${DISTNAME}/source
+GNU_CONFIGURE= yes
+
+SAMBA_VERSION= 2.2.12
+JA_VERSION= 1.0beta1
+JA_PKG_VERSION= 0.9.1
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_SYSCONFSUBDIR?= samba
+PKG_SYSCONFVAR= samba
+
+SAMBA_USER?= samba
+SAMBA_GROUP?= samba
+
+SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
+SAMBA_LIBDIR?= ${PREFIX}/lib/samba
+SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba
+SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log
+SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run
+SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
+SAMBA_VARDIR?= ${VARBASE}
+
+FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR}
+FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
+FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
+FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR}
+FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
+FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR}
+
+CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
+CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR}
+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+= --localstatedir=${SAMBA_VARDIR}
+
+CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_LIBDIR}/codepages
+CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat
+CONFIGURE_ARGS+= --with-libsmbclient
+CONFIGURE_ARGS+= --with-msdfs
+CONFIGURE_ARGS+= --with-winbind
+
+CONFIGURE_ARGS+= --with-i18n-swat
-USE_PKGINSTALL= YES
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+.include "../../converters/libiconv/buildlink3.mk"
+CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
+
+## Force the use of the included gettext library this doesn't seem to link
+## with the gettext-lib package.
+##
+CONFIGURE_ARGS+= --with-included-gettext
+
+USE_GNU_READLINE= yes # uses rl_event_hook interface to GNU readline
+.include "../../devel/readline/buildlink3.mk"
+CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
+
+CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
+
+.include "options.mk"
+
+# mktemp is useful for the replacement adduser script, but don't require
+# a full dependency since it's not actually needed by samba.
+#
+USE_TOOLS+= mktemp
+
+#
+# findsmb script use perl
+#
+USE_TOOLS+= perl
+
+.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}
+
+.if !empty(NSS_WINBIND)
+PLIST_SUBST+= NSS_WINBIND=lib/${NSS_WINBIND}
+.else
+PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module"
+.endif
+.if !empty(NSS_WINS)
+PLIST_SUBST+= NSS_WINS=lib/${NSS_WINS}
+.else
+PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module"
+.endif
+
+DOCDIR= ${PREFIX}/share/doc/samba
+EGDIR= ${PREFIX}/share/examples/samba
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
+USE_LANGUAGE= c
+USE_LIBTOOL= yes
+SHLIBTOOL_OVERRIDE= libtool
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-# Force the use of the included gettext library this doesn't seem to link
-# with the gettext-lib package.
-#
-CONFIGURE_ARGS+= --with-included-gettext
+USE_PKGINSTALL= YES
+CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
+SUPPORT_FILES_PERMS+= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
+ ${ROOT_USER} ${ROOT_GROUP} 0555
+SUPPORT_FILES_PERMS+= ${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \
+ ${ROOT_USER} ${ROOT_GROUP} 0555
+#SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE}
+MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
+OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
+OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
+RCD_SCRIPTS= samba nmbd smbd winbindd
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
+PKG_GROUPS= ${SAMBA_GROUP}
+PKG_USERS= ${SAMBA_USER}:${SAMBA_GROUP}::Samba\\ pseudo-user
-# Microsoft DFS support
-CONFIGURE_ARGS+= --with-msdfs
+BUILD_DEFS+= SAMBA_USER SAMBA_GROUP
+MAKE_FLAGS= CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"'
+
+INSTALL_LIBRARY= \
+ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP}
MESSAGE_SUBST+= ROOT_USER=${ROOT_USER}
-DOCDIR= ${PREFIX}/share/doc/samba
-EXAMPLESDIR= ${PREFIX}/share/examples/samba
-
-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
-
# mktemp is useful for the replacement adduser script, but don't require
# a full dependency since it's not actually needed by samba.
#
@@ -67,9 +151,6 @@
REPLACE_PERL= script/findsmb.in
-.include "../../devel/readline/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
# Remove irrelevant files for this package.
post-extract:
${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \
@@ -88,23 +169,31 @@
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
post-install:
- # Install Samba documentation.
+ -cd ${PREFIX}/lib && ${LN} -s libsmbclient.so libsmbclient.so.0
+.if !empty(NSS_WINBIND)
+ ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib
+.endif
+.if !empty(PKG_OPTIONS:Mpam)
+ ${INSTALL_LIBRARY} ${WRKSRC}/bin/pam_smbpass.so ${PREFIX}/lib/security
+ ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so \
+ ${PREFIX}/lib/security
+.endif
${INSTALL_DATA_DIR} ${DOCDIR}
cd ${WRKDIR}/${DISTNAME}/docs; \
- for file in announce textdocs/* Registry/*.reg; do \
- ${INSTALL_DATA} $$file ${DOCDIR}; \
+ for f in announce textdocs/* Registry/*.reg; do \
+ ${INSTALL_DATA} $${f} ${DOCDIR}; \
done
# 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}
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EGDIR}/adduser.sh
+ ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EGDIR}/deluser.sh
+ ${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${EGDIR}
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EGDIR}
+ ${CHMOD} -R ugo-w ${EGDIR}
${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd \
- ${EXAMPLESDIR}/misc
+ ${EGDIR}/misc
${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \
${PREFIX}/sbin/mksmbpasswd
diff -r dc16aac058b9 -r 2a0b9c6fe5bc net/ja-samba/Makefile.common
--- a/net/ja-samba/Makefile.common Sun Jun 19 17:40:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2004/10/03 16:16:39 taca Exp $
-
-DISTNAME= samba-${SAMBA_BASE_VERS}-ja-${SAMBA_JA_VERS}
-SAMBA_BASE_VERS= 2.2.11
-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://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
-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
-
Home |
Main Index |
Thread Index |
Old Index