Date: Sat, 3 Nov 2012 03:08:45 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306898 - in head/net/samba36: . files Message-ID: <201211030308.qA338jxR066761@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Sat Nov 3 03:08:45 2012 New Revision: 306898 URL: http://svn.freebsd.org/changeset/ports/306898 Log: Update port to the 3.6.9 version Feature safe: yes Modified: head/net/samba36/Makefile head/net/samba36/distinfo head/net/samba36/files/patch-source3__configure.in head/net/samba36/files/samba.in Modified: head/net/samba36/Makefile ============================================================================== --- head/net/samba36/Makefile Sat Nov 3 02:58:56 2012 (r306897) +++ head/net/samba36/Makefile Sat Nov 3 03:08:45 2012 (r306898) @@ -6,7 +6,7 @@ # PORTNAME= ${SAMBA_BASENAME}36 -PORTVERSION= 3.6.8 +PORTVERSION= 3.6.9 PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} Modified: head/net/samba36/distinfo ============================================================================== --- head/net/samba36/distinfo Sat Nov 3 02:58:56 2012 (r306897) +++ head/net/samba36/distinfo Sat Nov 3 03:08:45 2012 (r306898) @@ -1,2 +1,2 @@ -SHA256 (samba-3.6.8.tar.gz) = 4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b3514de -SIZE (samba-3.6.8.tar.gz) = 34070798 +SHA256 (samba-3.6.9.tar.gz) = 9714b50c1bbdb0d3521bdbf403bb112b5405040685cb0b4ff3f9a370d1e84020 +SIZE (samba-3.6.9.tar.gz) = 34077002 Modified: head/net/samba36/files/patch-source3__configure.in ============================================================================== --- head/net/samba36/files/patch-source3__configure.in Sat Nov 3 02:58:56 2012 (r306897) +++ head/net/samba36/files/patch-source3__configure.in Sat Nov 3 03:08:45 2012 (r306898) @@ -1,6 +1,26 @@ ---- ./source3/configure.in.orig 2012-09-14 08:12:09.000000000 +0000 -+++ ./source3/configure.in 2012-10-20 15:02:17.725815685 +0000 -@@ -868,9 +868,13 @@ +--- ./source3/configure.in.orig 2012-10-29 09:05:46.000000000 +0000 ++++ ./source3/configure.in 2012-11-01 13:16:20.589876378 +0000 +@@ -759,7 +759,6 @@ + if test x"$ac_cv_header_md5_h" = x"yes"; then + AC_DEFINE(HAVE_MD5_H, 1, + [Whether md5.h is available.]) +- AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5]) + fi + + if test x"$ac_cv_header_md5_h" = x"yes" -a \ +@@ -769,6 +768,11 @@ + + if test x"$ac_cv_header_md5_h" = x"yes" -a \ + x"$samba_cv_md5lib" = x"none" ; then ++ AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5]) ++fi ++ ++if test x"$ac_cv_header_md5_h" = x"yes" -a \ ++ x"$samba_cv_md5lib" = x"none" ; then + AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""]) + fi + +@@ -868,9 +872,13 @@ AC_PATH_PROG(CUPS_CONFIG, cups-config) if test "x$CUPS_CONFIG" != x; then @@ -15,7 +35,7 @@ AC_CHECK_HEADERS(cups/cups.h cups/language.h) if test x"$ac_cv_header_cups_cups_h" = xyes -a \ -@@ -879,7 +883,7 @@ +@@ -879,7 +887,7 @@ # underlinked. With cups-config --libs we pull in unwanted and unneeded # dendencies including thread libraries - use cups-config only if really # required. @@ -24,7 +44,7 @@ [PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"], [AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ; PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"]) -@@ -889,10 +893,10 @@ +@@ -889,10 +897,10 @@ AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt) else AC_MSG_WARN([cups-config around but cups-devel not installed]) @@ -37,7 +57,7 @@ elif test x"$enable_cups" = x"yes"; then AC_MSG_ERROR(Cups support required but cups-config not located. Make sure cups-devel related files are installed.) -@@ -1849,7 +1853,7 @@ +@@ -1849,7 +1857,7 @@ fi if test x"$BLDSHARED" = x"true" ; then @@ -46,7 +66,7 @@ fi AC_MSG_RESULT($BLDSHARED) -@@ -1980,9 +1984,6 @@ +@@ -1980,9 +1988,6 @@ AC_MSG_CHECKING([PICFLAG]) AC_MSG_RESULT([$PICFLAG]) @@ -56,7 +76,7 @@ AC_CACHE_CHECK([whether building shared libraries actually works], [ac_cv_shlib_works],[ # try building a trivial shared library -@@ -4639,15 +4640,51 @@ +@@ -4639,15 +4644,51 @@ x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then if test x"${try_pam}" = x"yes";then AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found]) @@ -112,7 +132,7 @@ if test x"$create_pam_modules" = x"yes"; then AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support]) -@@ -4657,7 +4694,7 @@ +@@ -4657,7 +4698,7 @@ AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h) AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS) else @@ -121,7 +141,7 @@ fi fi AC_MSG_CHECKING(whether to use PAM support) -@@ -5859,9 +5896,17 @@ +@@ -5859,9 +5900,17 @@ [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for aio_suspend) @@ -142,7 +162,7 @@ [AC_MSG_RESULT(no)]) fi -@@ -6314,12 +6359,13 @@ +@@ -6319,12 +6368,13 @@ NSSSONAMEVERSIONSUFFIX=".2" WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o" ;; @@ -157,7 +177,7 @@ WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT" WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT" ;; -@@ -6466,10 +6512,14 @@ +@@ -6471,10 +6521,14 @@ AC_MSG_RESULT(no$winbind_no_reason) fi @@ -172,7 +192,7 @@ AC_SUBST(NSSSONAMEVERSIONSUFFIX) AC_SUBST(WINBIND_KRB5_LOCATOR) -@@ -6788,13 +6838,21 @@ +@@ -6793,13 +6847,21 @@ # Start AC_CHECK_FUNC(getmntent) @@ -195,7 +215,7 @@ int main(void) { struct statfs fsd; -@@ -7094,6 +7152,16 @@ +@@ -7099,6 +7161,16 @@ LIBS="$LIBS -ldmalloc" fi @@ -212,7 +232,7 @@ dnl Remove -L/usr/lib/? from LDFLAGS and LIBS LIB_REMOVE_USR_LIB(LDFLAGS) LIB_REMOVE_USR_LIB(LIBS) -@@ -7142,6 +7210,7 @@ +@@ -7147,6 +7219,7 @@ AC_SUBST(SMBD_LIBS) CFLAGS="${CFLAGS} \$(FLAGS)" Modified: head/net/samba36/files/samba.in ============================================================================== --- head/net/samba36/files/samba.in Sat Nov 3 02:58:56 2012 (r306897) +++ head/net/samba36/files/samba.in Sat Nov 3 03:08:45 2012 (r306898) @@ -21,7 +21,7 @@ %%WINBIND%%#winbindd_enable="YES" # # Configuration file can be set with: -#samba_config="/usr/local/etc/smb.conf" +#samba_config="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%" # . /etc/rc.subr @@ -39,9 +39,9 @@ reload_precmd="samba_checkconfig" reload_cmd="samba_reload_cmd" rcvar_cmd="samba_rcvar_cmd" # Defaults -samba_config_default="/usr/local/etc/smb.conf" -testparm_command="/usr/local/bin/testparm" -smbcontrol_command="/usr/local/bin/smbcontrol" +samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%" +testparm_command="%%PREFIX%%/bin/testparm" +smbcontrol_command="%%PREFIX%%/bin/smbcontrol" samba_parm="${testparm_command} -s -v --parameter-name" pid_extra= # @@ -134,7 +134,7 @@ samba_cmd() { # Daemon should be enabled and running if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args} - # If any of the of the commands failed, take it as a total result + # If any of the commands failed, take it as a global result result=$((${result} || $?)) fi done @@ -176,7 +176,7 @@ samba_config_init() { # Load configuration variables samba_config_init -# Where is lockdir +# Where is the lockdir samba_lockdir=$(${samba_parm} 'lock directory' "${samba_config}" 2>/dev/null) # Common flags command_args=${samba_config:+-s "${samba_config}"} #"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211030308.qA338jxR066761>