diff options
| -rw-r--r-- | japanese/samba/Makefile | 6 | ||||
| -rw-r--r-- | japanese/samba/distinfo | 4 | ||||
| -rw-r--r-- | japanese/samba/files/patch-smbd:vfs.c | 10 | ||||
| -rw-r--r-- | japanese/samba/scripts/configure.samba | 101 |
4 files changed, 5 insertions, 116 deletions
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile index e06a34a98b88..e8840b64706d 100644 --- a/japanese/samba/Makefile +++ b/japanese/samba/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \ ftp://SunSITE.tus.ac.jp/pub/archives/packages/samba/samba-jp/%SUBDIR%/ \ ftp://ftp.plathome.co.jp/pub/samba/samba-jp/%SUBDIR%/ \ ftp://ftp2.samba.gr.jp/pub/samba-jp/%SUBDIR%/ -MASTER_SITE_SUBDIR= ${PORTNAME}-${SAMBA_VERSION}-ja +MASTER_SITE_SUBDIR= ${PORTNAME}-${SAMBA_VERSION}-ja/beta DISTNAME= ${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION} MAINTAINER= nakaji@jp.FreeBSD.org @@ -22,8 +22,8 @@ COMMENT= A free SMB and CIFS client and server for UNIX CONFLICTS= samba-2.2.* samba-3.0.* sharity-light-1.* -SAMBA_VERSION= 2.2.11 -SAMBA_JA_VERSION= 1.0 +SAMBA_VERSION= 2.2.12 +SAMBA_JA_VERSION= 1.0beta1 USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo index cbb2c6bb41f2..2b05ba61a5ac 100644 --- a/japanese/samba/distinfo +++ b/japanese/samba/distinfo @@ -1,2 +1,2 @@ -MD5 (samba-2.2.11-ja-1.0.tar.bz2) = f418c850a54572f7d4cd77fa4ef876c6 -SIZE (samba-2.2.11-ja-1.0.tar.bz2) = 7473344 +MD5 (samba-2.2.12-ja-1.0beta1.tar.bz2) = 9a7343c7f828b60f3a8f381019d19af1 +SIZE (samba-2.2.12-ja-1.0beta1.tar.bz2) = 7466052 diff --git a/japanese/samba/files/patch-smbd:vfs.c b/japanese/samba/files/patch-smbd:vfs.c deleted file mode 100644 index 5faca1a0c2ee..000000000000 --- a/japanese/samba/files/patch-smbd:vfs.c +++ /dev/null @@ -1,10 +0,0 @@ ---- smbd/vfs.c.orig Sat Oct 9 09:49:52 2004 -+++ smbd/vfs.c Sat Oct 9 09:50:17 2004 -@@ -790,7 +790,6 @@ - *dir2 = *wd = *base_name = *newname = 0; - - if (widelinks) { -- unix_clean_name(s); - /* can't have a leading .. */ - if (strncmp(s,"..",2) == 0 && (s[2]==0 || s[2]=='/')) { - DEBUG(3,("Illegal file name? (%s)\n",s)); diff --git a/japanese/samba/scripts/configure.samba b/japanese/samba/scripts/configure.samba deleted file mode 100644 index 19ae74c39605..000000000000 --- a/japanese/samba/scripts/configure.samba +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${BATCH}" ]; then - if [ "${SAMBA_OPTIONS}" ]; then - set ${SAMBA_OPTIONS} - fi -else - /usr/bin/dialog --title "configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 12 \ -syslog "With syslog support" OFF \ -ssl "With ssl support" OFF \ -ldap "With LDAP2 support" OFF \ -cups "With CUPS" OFF \ -acl "With ACL support" OFF \ -utmp "With UTMP support" OFF \ -msdfs "With MSDFS support" OFF \ -quota "With Quota support" OFF \ -recycle "With Recycle Bin" OFF \ -audit "With Audit" OFF \ -winbind "With Winbind" OFF \ -wbauth "With Winbind Auth Challenge" OFF \ -smbsh "With Smbsh and smbwrapper" OFF \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `cat $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - echo "Nothing selected" - fi - ;; - 1) echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${REALCURDIR} -echo "SCRIPT_RUN=yes" >${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - -while [ "$1" ]; do - case $1 in - \"syslog\") - echo "WITH_SYSLOG=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"ssl\") - echo "WITH_SSL=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"ldap\") - echo "WITH_LDAP=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"cups\") - echo "WITH_CUPS=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"acl\") - echo "WITH_ACL_SUPPORT=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"utmp\") - echo "WITH_UTMP=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"msdfs\") - echo "WITH_MSDFS=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"quota\") - echo "WITH_QUOTAS=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"recycle\") - echo "WITH_RECYCLE=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"audit\") - echo "WITH_AUDIT=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"winbind\") - echo "WITH_WINBIND=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"wbauth\") - echo "WITH_WINBIND_AUTH_CHALLENGE=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"smbsh\") - echo "WITH_SMBSH=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - *) - echo "Invalid option: $1" - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done |