Page MenuHomeFreeBSD
Files F151355298

D8919.diff
No OneTemporary
Actions

D8919.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9131,3 +9131,7 @@
databases/p5-DBD-Oracle||2017-03-07|Has expired: Depends on deprecated Oracle 7 (or 8) client
databases/jdbc-oracle8i||2017-03-07|Has expired: Oracle8i unsupported and unavailable; fetch site redirects
databases/jdbc-oracle9i||2017-03-07|Has expired: Oracle 9i is no more supported
+net/samba-libsmbclient||2017-0X-XX|Obsolete
+net/samba-nmblookup||2017-0X-XX|Obsolete
+net/samba-smbclient||2017-0X-XX|Obsolete
+net/samba36||2017-0X-XX|Obsolete
Index: Mk/Uses/samba.mk
===================================================================
--- /dev/null
+++ Mk/Uses/samba.mk
@@ -0,0 +1,51 @@
+# $FreeBSD$
+#
+# Handle dependency on samba
+#
+# Feature: samba
+# Usage: USES=samba or USES=samba:ARGS
+# Valid ARGS: build, env, lib, run
+# default is build,run (implicit)
+#
+# When subpackages are available this can be more granular
+#
+
+.if !defined(_INCLUDE_USES_SAMBA_MK)
+_INCLUDE_USES_SAMBA_MK= yes
+
+.if !${samba_ARGS}
+samba_ARGS= build run
+.endif
+
+.if ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
+IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
+.endif
+
+.if ${SAMBA_DEFAULT} == 4.2
+SAMBAINCLUDES= ${LOCALBASE}/include/samba4
+SAMBALIBS= ${LOCALBASE}/lib
+SAMBAPORT= net/samba42
+.elif ${SAMBA_DEFAULT} == 4.3
+SAMBAINCLUDES= ${LOCALBASE}/include/samba4
+SAMBALIBS= ${LOCALBASE}/lib
+SAMBAPORT= net/samba43
+.elif ${SAMBA_DEFAULT} == 4.4
+SAMBAINCLUDES= ${LOCALBASE}/include/samba4
+SAMBALIBS= ${LOCALBASE}/lib/samba4
+SAMBAPORT= net/samba44
+.else
+IGNORE= Invalid version of samba: ${SAMBA_DEFAULT}
+.endif
+
+.if ${samba_ARGS:Mbuild}
+BUILD_DEPENDS+= smbd:${SAMBAPORT}
+.endif
+.if ${samba_ARGS:Mlib}
+LIB_DEPENDS+= libsmbclient.so:${SAMBAPORT}
+.endif
+.if ${samba_ARGS:Mrun}
+RUN_DEPENDS+= smbd:${SAMBAPORT}
+.endif
+
+.endif
+
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ Mk/bsd.default-versions.mk
@@ -83,6 +83,8 @@
PYTHON3_DEFAULT?= 3.5
# Possible values: 2.1, 2.2, 2.3, 2.4
RUBY_DEFAULT?= 2.3
+# Possible values: 4.2, 4.3, 4.4
+SAMBA_DEFAULT?= 4.3
# Possible values: base, openssl, openssl-devel, libressl, libressl-devel
.if !defined(SSL_DEFAULT)
# If no preference was set, check for an installed base version
Index: audio/musicpd/Makefile
===================================================================
--- audio/musicpd/Makefile
+++ audio/musicpd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= musicpd
PORTVERSION= 0.20.5
+PORTREVISION= 1
CATEGORIES= audio ipv6
MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
DISTNAME= mpd-${PORTVERSION}
@@ -121,7 +122,7 @@
SIDPLAY2_CONFIGURE_ENABLE=sidplay
SIDPLAY2_LIB_DEPENDS=libsidplay2.so:audio/libsidplay2
SMB_CONFIGURE_enable=smbclient
-SMB_LIB_DEPENDS=libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SNDFILE_CONFIGURE_ENABLE=sndfile
SNDFILE_LIB_DEPENDS=libsndfile.so:audio/libsndfile
SNDIO_CONFIGURE_ENABLE=sndio
Index: audio/xmms2/Makefile
===================================================================
--- audio/xmms2/Makefile
+++ audio/xmms2/Makefile
@@ -4,7 +4,7 @@
PORTNAME?= xmms2
PORTVERSION= 0.8
DISTVERSIONSUFFIX= DrO_o
-PORTREVISION?= 19
+PORTREVISION?= 20
CATEGORIES?= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
@@ -122,7 +122,9 @@
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_OFF= --without-plugins="pulse"
-SAMBA_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SAMBA_USES= samba:lib
+SAMBA_CPPFLAGS= -I${SAMBAINCLUDES}
+SAMBA_LDFLAGS= -L${SAMBALIBS}
SAMBA_CONFIGURE_OFF= --without-plugins="samba"
SID_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2
Index: devel/gnome-vfs/Makefile
===================================================================
--- devel/gnome-vfs/Makefile
+++ devel/gnome-vfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-vfs
PORTVERSION= 2.24.4
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -61,7 +61,8 @@
.endif
.if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+= libsmbclient.so:net/samba-libsmbclient
+CONFIGURE_ARGS+=--with-samba-includes=${SAMBAINCLUDES} --with-samba-libs=${SAMBALIBS}
+USES+= samba:lib
PLIST_SUB+= SAMBA=""
.else
PLIST_SUB+= SAMBA="@comment "
Index: devel/gvfs/Makefile
===================================================================
--- devel/gvfs/Makefile
+++ devel/gvfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gvfs
PORTVERSION= 1.26.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -53,8 +53,9 @@
FUSE_USES= fuse
FUSE_CONFIGURE_ENABLE= fuse
-SAMBA_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SAMBA_USES= samba:lib
SAMBA_CONFIGURE_ENABLE= samba
+SAMBA_CONFIGURE_WITH= samba-includes=${SAMBAINCLUDES} samba-libs=${SAMBALIBS}
CDDA_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia
CDDA_CONFIGURE_ENABLE= cdda
Index: emulators/qemu-devel/Makefile
===================================================================
--- emulators/qemu-devel/Makefile
+++ emulators/qemu-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qemu
DISTVERSION= 2.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
PKGNAMESUFFIX= -devel
@@ -63,7 +63,7 @@
STATIC_LINK_CONFIGURE_ON= --static
STATIC_LINK_PREVENTS= GTK2 X11
STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static
-SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:net/samba36
+SAMBA_USES= samba:run # smbd
DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html
DOCS_USES= makeinfo
DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1
Index: emulators/qemu-devel/pkg-message
===================================================================
--- emulators/qemu-devel/pkg-message
+++ emulators/qemu-devel/pkg-message
@@ -44,7 +44,7 @@
the same way.
- The -smb option (smb-export local dir to guest using the default
- slirp networking) needs the net/samba36 port/package installed
+ slirp networking) needs the samba port/package installed
in addition to qemu. (SAMBA knob.)
- If you want to use usb devices connected to the host in the guest
Index: emulators/qemu-sbruno/Makefile
===================================================================
--- emulators/qemu-sbruno/Makefile
+++ emulators/qemu-sbruno/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qemu
PORTVERSION= 2.8.50.g20170307
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= GH \
LOCAL/nox:dtc \
@@ -211,7 +212,7 @@
.endif
.if ${PORT_OPTIONS:MSAMBA}
-RUN_DEPENDS+= ${LOCALBASE}/sbin/smbd:net/samba36
+USES+= samba:run # smbd
.endif
.if ${PORT_OPTIONS:MDOCS}
Index: emulators/qemu-sbruno/pkg-message
===================================================================
--- emulators/qemu-sbruno/pkg-message
+++ emulators/qemu-sbruno/pkg-message
@@ -44,7 +44,7 @@
the same way.
- The -smb option (smb-export local dir to guest using the default
- slirp networking) needs the net/samba36 port/package installed
+ slirp networking) needs the samba port/package installed
in addition to qemu. (SAMBA knob.)
- If you want to use usb devices connected to the host in the guest
Index: emulators/qemu/Makefile
===================================================================
--- emulators/qemu/Makefile
+++ emulators/qemu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qemu
PORTVERSION= 2.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
DIST_SUBDIR= qemu/${PORTVERSION}
@@ -66,7 +66,7 @@
STATIC_LINK_PREVENTS= GTK2 X11
STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static
NCURSES_USES= ncurses:base
-SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:net/samba36
+SAMBA_USES= samba:run # smbd
DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html
DOCS_USES= makeinfo
DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1
Index: emulators/qemu/pkg-message
===================================================================
--- emulators/qemu/pkg-message
+++ emulators/qemu/pkg-message
@@ -44,7 +44,7 @@
the same way.
- The -smb option (smb-export local dir to guest using the default
- slirp networking) needs the net/samba36 port/package installed
+ slirp networking) needs the samba port/package installed
in addition to qemu. (SAMBA knob.)
- If you want to use usb devices connected to the host in the guest
Index: mail/libmapi/Makefile
===================================================================
--- mail/libmapi/Makefile
+++ mail/libmapi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmapi
PORTVERSION= 2.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= https://github.com/openchange/openchange/archive/
DISTNAME= openchange-${PORTVERSION}-${CODENAME}
@@ -28,7 +28,7 @@
USE_MYSQL= yes
USES= autoreconf:build bison compiler:c++11-lib gmake pathfix \
- pkgconfig python shebangfix sqlite
+ pkgconfig python samba:lib shebangfix sqlite
PATHFIX_MAKEFILEIN= Makefile
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -48,24 +48,18 @@
OPTIONS_SUB= yes
OPTIONS_DEFINE= BOOST DOXYGEN
-# SAMBA43
OPTIONS_DEFAULT=BOOST
BOOST_LIB_DEPENDS= libboost_thread.so:devel/boost-libs
BOOST_CONFIGURE_ENV_OFF= ov_cv_boost_thread=no
BOOST_DESC= libmapi C++ library (needs boost)
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_CONFIGURE_ENV_OFF= ac_cv_path_DOXYGEN=""
-SAMBA43_DESC= Build agains samba 4.3 instead of 4.2
+PLIST_SUB= SAMBA=${SAMBAPORT:T}
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
-# no support for samba 4.3 yet
-.if ${PORT_OPTIONS:MSAMBA43}
-SAMBA_DEP= samba43>=4.3.0:net/samba43
-PLIST_SUB+= SAMBA=samba43
-.else
-SAMBA_DEP= samba42>=4.2.0:net/samba42
-PLIST_SUB+= SAMBA=samba42
+.if ${SAMBA_DEFAULT} == 4.4
+BROKEN= fails to build
.endif
# --enable-openchange-qt4 Compile OpenChange Qt4 wrapper.
@@ -89,4 +83,4 @@
@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/shared-modules/dcerpc_server/*.so
@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/modules/dcerpc_mapiproxy*/*.so
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: misc/amanda-server/Makefile
===================================================================
--- misc/amanda-server/Makefile
+++ misc/amanda-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amanda
PORTVERSION= 3.3.6
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= misc
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
@@ -122,9 +122,7 @@
.endif
.if ${PORT_OPTIONS:MSAMBA}
-SAMBA_PORT?= samba44
-BUILD_DEPENDS+= smbclient:net/${SAMBA_PORT}
-RUN_DEPENDS+= smbclient:net/${SAMBA_PORT}
+USES+= pkgconfig samba
CONFIGURE_ARGS+= --with-smbclient=${LOCALBASE}/bin/smbclient
.endif
Index: misc/linm/Makefile
===================================================================
--- misc/linm/Makefile
+++ misc/linm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= linm
DISTVERSION= 0.8.1-1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc shells
MASTER_SITES= http://kldp.net/frs/download.php/4508/
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -29,8 +29,10 @@
OPTIONS_DEFINE= SMB DOCS
OPTIONS_SUB= yes
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
SMB_CONFIGURE_ENV_OFF= ac_cv_lib_smbclient_smbc_new_context=no
+SMB_CPPFLAGS= -I${SAMBAINCLUDES}
+SMB_LIBS= -L${SAMBALIBS}
+SMB_USES= iconv samba:lib
post-patch:
@${REINPLACE_CMD} -e 's|configpath|cfgpath|g' ${WRKSRC}/configure
Index: multimedia/ffmpeg/Makefile
===================================================================
--- multimedia/ffmpeg/Makefile
+++ multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 3.2.4
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -305,7 +305,7 @@
SDL_CONFIGURE_OFF= --disable-outdev=sdl --disable-sdl2
# smbclient
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SMB_CONFIGURE_ENABLE= libsmbclient
SMB_IMPLIES= GPL3
Index: multimedia/gmerlin-avdecoder/Makefile
===================================================================
--- multimedia/gmerlin-avdecoder/Makefile
+++ multimedia/gmerlin-avdecoder/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gmerlin-avdecoder
PORTVERSION= 1.2.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= multimedia
MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
@@ -87,7 +87,9 @@
.endif
.if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+= libsmbclient.so:net/samba-libsmbclient
+USES+= samba:lib
+CPPFLAGS+= -I${SAMBAINCLUDES}
+LDFLAGS+= -L${SAMBALIBS}
.else
CONFIGURE_ARGS+=--disable-samba
.endif
Index: multimedia/kodi/Makefile
===================================================================
--- multimedia/kodi/Makefile
+++ multimedia/kodi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kodi
DISTVERSION= 16.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia java
MAINTAINER= mickael.maillot@gmail.com
@@ -136,8 +136,7 @@
RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp
RTMP_CONFIGURE_ENABLE= rtmp
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
-SMB_RUN_DEPENDS= nmblookup:net/samba-nmblookup
+SMB_USES= samba:lib
SMB_CONFIGURE_ENABLE= samba
VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
Index: multimedia/libxine/Makefile
===================================================================
--- multimedia/libxine/Makefile
+++ multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xine
PORTVERSION= 1.2.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
PKGNAMEPREFIX= lib
@@ -97,9 +97,9 @@
XVMC_LIB_DEPENDS= libXvMC.so:x11/libXvMC
.endif
XVMC_CONFIGURE_OFF= --disable-xvmc
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
-SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${LOCALBASE}/lib -lsmbclient" \
- LIBSMBCLIENT_CFLAGS="-I${LOCALBASE}/include"
+SMB_USES= samba:lib
+SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
+ LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
SMB_CONFIGURE_ENABLE= samba
AALIB_LIB_DEPENDS= libaa.so:graphics/aalib
AALIB_CONFIGURE_OFF= --disable-aalib --disable-aalibtest
Index: multimedia/mplayer/Makefile.common
===================================================================
--- multimedia/mplayer/Makefile.common
+++ multimedia/mplayer/Makefile.common
@@ -6,7 +6,7 @@
MPLAYER_PORT_VERSION= 1.3.0
MPLAYER_SNAPSHOT_DATE= 2016-12-28
-PORTREVISION?= 4
+PORTREVISION?= 5
MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
Index: multimedia/mplayer/Makefile.optvars
===================================================================
--- multimedia/mplayer/Makefile.optvars
+++ multimedia/mplayer/Makefile.optvars
@@ -116,7 +116,8 @@
SKINS_RUN_DEPENDS= mplayer-skins>=0:multimedia/mplayer-skins
SKINS_IMPLIES= GUI
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
+SMB_CONFIGURE_ON= --extra-ldflags="-L${SAMBALIBS}"
SMB_CONFIGURE_OFF= --disable-smb
SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
Index: multimedia/mplayer2/Makefile
===================================================================
--- multimedia/mplayer2/Makefile
+++ multimedia/mplayer2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mplayer2
PORTVERSION= ${MPLAYER2_PORT_VERSION}
-PORTREVISION= 28
+PORTREVISION= 29
CATEGORIES= multimedia audio
MASTER_SITES= LOCAL/gblach/
@@ -148,7 +148,8 @@
SDL_USE= SDL=sdl
SDL_CONFIGURE_OFF= --disable-sdl
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
+SMB_CONFIGURE_ON= --extra-cflags="-I${SAMBAINCLUDES}" --extra-ldflags="-L${SAMBALIBS}"
SMB_CONFIGURE_OFF= --disable-smb
SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
Index: multimedia/mpv/Makefile
===================================================================
--- multimedia/mpv/Makefile
+++ multimedia/mpv/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mpv
PORTVERSION= 0.24.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio
@@ -118,7 +118,7 @@
SNDIO_CONFIGURE_ON= --enable-sndio
SNDIO_CONFIGURE_OFF= --disable-sndio
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SMB_CONFIGURE_OFF= --disable-libsmbclient
UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet
Index: multimedia/vlc/Makefile
===================================================================
--- multimedia/vlc/Makefile
+++ multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 2.2.4
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 4
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
@@ -274,7 +274,7 @@
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_CONFIGURE_ENABLE= sndio
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SMB_CONFIGURE_ENABLE= smbclient
STREAM_CONFIGURE_ENABLE=sout
Index: net-mgmt/sdig/pkg-message
===================================================================
--- net-mgmt/sdig/pkg-message
+++ net-mgmt/sdig/pkg-message
@@ -1,2 +1,2 @@
If you wish to use the NMBLOOKUP option within sdig, you must
-install net/samba-nmblookup (or net/samba).
+install samba.
Index: net/Makefile
===================================================================
--- net/Makefile
+++ net/Makefile
@@ -1227,10 +1227,6 @@
SUBDIR += rubygem-uri-redis
SUBDIR += rubygem-whois
SUBDIR += rude
- SUBDIR += samba-libsmbclient
- SUBDIR += samba-nmblookup
- SUBDIR += samba-smbclient
- SUBDIR += samba36
SUBDIR += samba42
SUBDIR += samba43
SUBDIR += samba44
Index: net/freeradius2/Makefile
===================================================================
--- net/freeradius2/Makefile
+++ net/freeradius2/Makefile
@@ -236,7 +236,7 @@
# No SMB option yet; rlm_smb is still unbuildable
#.if ${PORT_OPTIONS:MSMB}
-#LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+#USES+= samba:lib
#CONFIGURE_ARGS+=--with-rlm_smb
#CONFIGURE_ARGS+=--with-rlm-smb-lib-dir=${LOCALBASE}/lib
#CONFIGURE_ARGS+=--with-rlm-smb-include-dir=${LOCALBASE}/include
Index: net/jags/Makefile
===================================================================
--- net/jags/Makefile
+++ net/jags/Makefile
@@ -3,20 +3,16 @@
PORTNAME= jags
PORTVERSION= 0.22.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= JAGS - Just Another GTK+ Samba Client
-RUN_DEPENDS= smbclient:${SAMBA_PORT}
-
-SAMBA_PORT?= net/samba36
-
CONFLICTS= jags-1.*
-USES= gmake
+USES= gmake samba:run # smbclient
USE_XORG= xi xext x11
USE_GNOME= gtk12
GNU_CONFIGURE= yes
Index: net/opennx/Makefile
===================================================================
--- net/opennx/Makefile
+++ net/opennx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opennx
PORTVERSION= 0.16.0.729
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CI-source
@@ -15,20 +15,19 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/zip:archivers/zip
LIB_DEPENDS= libcups.so:print/cups \
- libcurl.so:ftp/curl \
- libsmbclient.so:net/samba-libsmbclient
+ libcurl.so:ftp/curl
WRKSRC= ${WRKDIR}/${PORTNAME}-0.16
GNU_CONFIGURE= yes
-USES= gmake
+USES= gmake samba:lib
USE_XORG= xmu
USE_WX= 2.8+
WX_UNICODE= yes
-LDFLAGS+= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib -L${SAMBALIBS}
CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG}
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${SAMBAINCLUDES}
INSTALLS_ICONS= yes
Index: net/p5-Filesys-SmbClient/Makefile
===================================================================
--- net/p5-Filesys-SmbClient/Makefile
+++ net/p5-Filesys-SmbClient/Makefile
@@ -11,14 +11,17 @@
MAINTAINER= perl@FreeBSD.org
COMMENT= Interface for access Samba filesystem with libsmclient.so
-LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+BROKEN= no member named close in struct _SMBCCTX
+
BUILD_DEPENDS= p5-Test-Simple>=0:devel/p5-Test-Simple
-USES= perl5
+USES= perl5 samba:lib
USE_PERL5= configure
post-patch:
@${REINPLACE_CMD} -i '' -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \
+ -e 's!%%SAMBAINCLUDES%%!${SAMBAINCLUDES}!g' \
+ -e 's!%%SAMBALIBS%%!${SAMBALIBS}!g' \
${WRKSRC}/Makefile.PL
post-install:
Index: net/p5-Filesys-SmbClient/files/patch-Makefile.PL
===================================================================
--- net/p5-Filesys-SmbClient/files/patch-Makefile.PL
+++ net/p5-Filesys-SmbClient/files/patch-Makefile.PL
@@ -34,8 +34,8 @@
-# Trace for debug
-$ans = prompt("Compile module with trace to STDERR ?", "no");
-if ($ans =~ /^y(es)?$/i) { $define = "-DVERBOSE"; }
-+my $include = '%%LOCALBASE%%/include/';
-+my $lib = '%%LOCALBASE%%/lib/';
++my $include = '%%SAMBAINCLUDES%%/';
++my $lib = '%%SAMBALIBS%%/';
# Create config.h for alloca via configure
-my $prefix = $include;
Index: net/pecl-smbclient/Makefile
===================================================================
--- net/pecl-smbclient/Makefile
+++ net/pecl-smbclient/Makefile
@@ -2,6 +2,7 @@
PORTNAME= smbclient
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= net pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -13,10 +14,10 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
-
-USES= php:ext tar:tgz
+USES= php:ext samba:lib tar:tgz
CONFIGURE_ARGS= --with-libsmbclient=${LOCALBASE}
+CPPFLAGS+= -I${SAMBAINCLUDES}
+LDFLAGS+= -L${SAMBALIBS}
.include <bsd.port.mk>
Index: net/prosearch/Makefile
===================================================================
--- net/prosearch/Makefile
+++ net/prosearch/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prosearch
PORTVERSION= 0.19.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net www
MASTER_SITES= http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
@@ -57,7 +57,7 @@
.endif
.if ${PORT_OPTIONS:MSAMBA}
-RUN_DEPENDS+=smbclient:net/samba44
+USES+= samba:run # smbclient
.endif
.if ${PORT_OPTIONS:MRSYNC}
Index: net/samba-libsmbclient/Makefile
===================================================================
--- net/samba-libsmbclient/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-PORTREVISION= 2
-PORTEPOCH= 0
-PKGNAMESUFFIX= -libsmbclient
-
-COMMENT= Shared lib from the samba package
-
-CONFLICTS=
-
-SAMBA_PORT= samba36
-SAMBA_SUBPORT= yes
-
-MASTERDIR= ${.CURDIR}/../${SAMBA_PORT}
-PKGDIR= ${.CURDIR}
-
-USE_LDCONFIG= ${PREFIX}/lib
-
-# We WANT shared libs
-CONFIGURE_ARGS+= --with-libsmbclient
-
-ALL_TARGET= libsmbclient
-
-do-install:
- -@${MKDIR} ${STAGEDIR}${MAN7PREFIX}/man/man7
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/libsmbclient.7 ${STAGEDIR}${MAN7PREFIX}/man/man7
- -@${MKDIR} ${STAGEDIR}${PREFIX}/include
- ${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${STAGEDIR}${PREFIX}/include
- ${INSTALL_DATA} ${WRKSRC}/pkgconfig/smbclient.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
- -@${MKDIR} ${STAGEDIR}${PREFIX}/lib
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.a ${STAGEDIR}${PREFIX}/lib
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so ${STAGEDIR}${PREFIX}/lib/libsmbclient.so.0
- ${LN} -snf libsmbclient.so.0 ${STAGEDIR}${PREFIX}/lib/libsmbclient.so
- -@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- @${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient/ ${STAGEDIR}${EXAMPLESDIR}
-
-.include "${MASTERDIR}/Makefile"
Index: net/samba-libsmbclient/pkg-descr
===================================================================
--- net/samba-libsmbclient/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the set of shared libraries from the Samba port. It lets other
-programs to utilize various aspects of the SMB protocol.
-
-WWW: http://www.samba.org/
Index: net/samba-libsmbclient/pkg-plist
===================================================================
--- net/samba-libsmbclient/pkg-plist
+++ /dev/null
@@ -1,46 +0,0 @@
-include/libsmbclient.h
-lib/libsmbclient.a
-lib/libsmbclient.so
-lib/libsmbclient.so.0
-libdata/pkgconfig/smbclient.pc
-man/man7/libsmbclient.7.gz
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/Makefile.internal
-%%EXAMPLESDIR%%/Makefile.internal.in
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/get_auth_data_fn.h
-%%EXAMPLESDIR%%/smbwrapper/Makefile
-%%EXAMPLESDIR%%/smbwrapper/README
-%%EXAMPLESDIR%%/smbwrapper/bsd-strlcat.c
-%%EXAMPLESDIR%%/smbwrapper/bsd-strlcpy.c
-%%EXAMPLESDIR%%/smbwrapper/bsd-strlfunc.h
-%%EXAMPLESDIR%%/smbwrapper/opendir_smbsh.c
-%%EXAMPLESDIR%%/smbwrapper/select.c
-%%EXAMPLESDIR%%/smbwrapper/smbsh.1
-%%EXAMPLESDIR%%/smbwrapper/smbsh.1.html
-%%EXAMPLESDIR%%/smbwrapper/smbsh.1.xml
-%%EXAMPLESDIR%%/smbwrapper/smbsh.c
-%%EXAMPLESDIR%%/smbwrapper/smbw.c
-%%EXAMPLESDIR%%/smbwrapper/smbw.h
-%%EXAMPLESDIR%%/smbwrapper/smbw_dir.c
-%%EXAMPLESDIR%%/smbwrapper/smbw_stat.c
-%%EXAMPLESDIR%%/smbwrapper/wrapper.c
-%%EXAMPLESDIR%%/smbwrapper/wrapper.h
-%%EXAMPLESDIR%%/testacl.c
-%%EXAMPLESDIR%%/testacl2.c
-%%EXAMPLESDIR%%/testacl3.c
-%%EXAMPLESDIR%%/testbrowse.c
-%%EXAMPLESDIR%%/testbrowse2.c
-%%EXAMPLESDIR%%/testchmod.c
-%%EXAMPLESDIR%%/testctx.c
-%%EXAMPLESDIR%%/testfstatvfs.c
-%%EXAMPLESDIR%%/testread.c
-%%EXAMPLESDIR%%/testsmbc.c
-%%EXAMPLESDIR%%/teststat.c
-%%EXAMPLESDIR%%/teststat2.c
-%%EXAMPLESDIR%%/teststat3.c
-%%EXAMPLESDIR%%/teststatvfs.c
-%%EXAMPLESDIR%%/testtruncate.c
-%%EXAMPLESDIR%%/testutime.c
-%%EXAMPLESDIR%%/testwrite.c
-%%EXAMPLESDIR%%/tree.c
Index: net/samba-nmblookup/Makefile
===================================================================
--- net/samba-nmblookup/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
-# $FreeBSD$
-
-PORTREVISION= 0
-PORTEPOCH= 0
-PKGNAMESUFFIX= -nmblookup
-
-COMMENT= NetBIOS Name lookup tool
-
-CONFLICTS= ja-samba-[23].* samba-[2-4].*
-
-SAMBA_PORT= samba36
-SAMBA_SUBPORT= yes
-
-MASTERDIR= ${.CURDIR}/../${SAMBA_PORT}
-PKGDIR= ${.CURDIR}
-
-PLIST_FILES= bin/nmblookup \
- man/man1/nmblookup.1.gz \
- man/man5/smb.conf.5.gz
-
-WITHOUT_ADS= yes
-
-ALL_TARGET= bin/nmblookup
-
-do-install:
- -@${MKDIR} ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/nmblookup ${STAGEDIR}${PREFIX}/bin
- -@${MKDIR} ${MAN1PREFIX}/man/man1 ${STAGEDIR}${MAN5PREFIX}/man/man5
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/nmblookup.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/smb.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
-
-.include "${MASTERDIR}/Makefile"
Index: net/samba-nmblookup/pkg-descr
===================================================================
--- net/samba-nmblookup/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a tool to query NetBIOS names and map them to IP addresses
-in a network using NetBIOS over TCP/IP queries from the Samba port.
-
-WWW: http://www.samba.org/
Index: net/samba-smbclient/Makefile
===================================================================
--- net/samba-smbclient/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Created by: garga
-# $FreeBSD$
-
-PORTREVISION= 0
-PORTEPOCH= 0
-PKGNAMESUFFIX= -smbclient
-
-COMMENT= Samba "ftp-like" client
-
-CONFLICTS= ja-samba-[23].* samba-[2-4].*
-
-SAMBA_PORT= samba36
-SAMBA_SUBPORT= yes
-
-SAMBA_CONFIG= smb-client.conf
-
-MASTERDIR= ${.CURDIR}/../${SAMBA_PORT}
-FILESDIR= ${.CURDIR}/files
-PKGDIR= ${.CURDIR}
-
-WITHOUT_ADS= yes
-
-PLIST_SUB+= SAMBA_CONFDIR="${SAMBA_CONFDIR:S,^${PREFIX}/,,}" \
- SAMBA_CONFIG="${SAMBA_CONFIG}"
-
-ALL_TARGET= bin/smbclient
-
-do-install:
- -@${MKDIR} ${STAGEDIR}${SAMBA_CONFDIR}
- ${INSTALL_DATA} ${FILESDIR}/smb-client.conf.sample ${STAGEDIR}${SAMBA_CONFDIR}/${SAMBA_CONFIG}.sample
- -@${MKDIR} ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/smbclient ${STAGEDIR}${PREFIX}/bin
- -@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/smbclient.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-
-.include "${MASTERDIR}/Makefile"
Index: net/samba-smbclient/files/smb-client.conf.sample
===================================================================
--- net/samba-smbclient/files/smb-client.conf.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-; workgroup = MYGROUP
-
-# Charset settings
-; display charset = koi8-r
-; unix charset = koi8-r
-; dos charset = cp866
Index: net/samba-smbclient/pkg-descr
===================================================================
--- net/samba-smbclient/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-smbclient is samba client with an "ftp like" interface. It is a useful tool to
-test connectivity to a Windows share. It can be used to transfer files, or to
-look at share names. In addition, it has a nifty ability to 'tar' (backup) and
-restore files from a server to a client and visa versa.
-
-WWW: http://www.samba.org/
Index: net/samba-smbclient/pkg-plist
===================================================================
--- net/samba-smbclient/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/smbclient
-man/man1/smbclient.1.gz
-%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%.sample
Index: net/samba36/Makefile
===================================================================
--- net/samba36/Makefile
+++ /dev/null
@@ -1,558 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= ${SAMBA_BASENAME}36
-PORTVERSION= 3.6.25
-PORTREVISION?= 3
-CATEGORIES?= net
-MASTER_SITES= SAMBA/samba SAMBA/samba/stable SAMBA/samba/pre
-DISTNAME= ${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
-PATCH_SITES= https://www.samba.org/samba/ftp/patches/security/
-PATCHFILES= samba-3.6.25-security-2015-12-16.patch:-p1
-
-MAINTAINER?= timur@FreeBSD.org
-COMMENT?= Free SMB and CIFS client and server for Unix
-
-LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING
-
-CONFLICTS?= *samba3[2-5]-3.*
-
-DEPRECATED= not supported by the upstream
-# Too many ports depend on this, so don't set an expiration date...
-# EXPIRATION_DATE= 2017-03-01
-
-# Additional patches from Sernet.de
-PATCH_STRIP= -p1
-EXTRA_PATCHES= ${PATCHDIR}/sernet.patch
-
-SAMBA_BASENAME= samba
-CPE_VENDOR= samba
-CPE_PRODUCT= samba
-
-EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
-WRKSRC= ${WRKDIR}/${DISTNAME}/source3
-IPATHS= -I${WRKDIR}/${DISTNAME}/source3/m4 -I${WRKDIR}/${DISTNAME}/m4 -I${WRKDIR}/${DISTNAME}/lib/replace -I${WRKDIR}/${DISTNAME}/source4
-AUTOHEADER_ARGS= ${IPATHS}
-AUTOCONF_ARGS= ${IPATHS}
-
-GNU_CONFIGURE= yes
-USES= cpe execinfo gmake iconv pkgconfig shebangfix
-SHEBANG_FILES= ../examples/LDAP/convertSambaAccount \
- ../examples/LDAP/get_next_oid \
- ../examples/LDAP/ol-schema-migrate.pl \
- ../examples/ad-bench/ad-bench.sh \
- ../examples/misc/adssearch.pl \
- ../examples/misc/check_multiple_LDAP_entries.pl \
- ../examples/misc/cldap.pl \
- ../examples/printing/smbprint \
- ../examples/scripts/idmap/idmap_nis.sh \
- ../examples/scripts/printing/cups/smbaddprinter.pl \
- ../examples/scripts/printing/cups/smbdelprinter.pl \
- ../examples/scripts/shares/perl/modify_samba_config.pl \
- ../examples/scripts/users_and_groups/adduserstogroups.pl \
- ../examples/scripts/users_and_groups/createdomobj.pl
-USE_AUTOTOOLS= autoconf autoheader
-USE_LDCONFIG= ${SAMBA_LIBDIR}
-# pkg-config is used to find talloc
-PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
-PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||}
-# directories
-VARDIR?= /var
-SAMBA_SPOOL?= ${VARDIR}/spool/${SAMBA_BASENAME}
-SAMBA_LOGDIR= ${VARDIR}/log/${SAMBA_BASENAME}
-SAMBA_RUNDIR= ${VARDIR}/run/${SAMBA_BASENAME}
-SAMBA_LOCKDIR?= ${VARDIR}/db/${SAMBA_BASENAME}
-SAMBA_CONFIG?= smb.conf
-SAMBA_CONFDIR?= ${PREFIX}/etc
-RC_DIR= ${PREFIX}/etc/rc.d
-SAMBA_SWATDIR= ${PREFIX}/share/swat
-SAMBA_LIBDIR= ${PREFIX}/lib
-SAMBA_MODULEDIR= ${SAMBA_LIBDIR}/${SAMBA_BASENAME}
-SAMBA_INCLUDEDIR= ${PREFIX}/include/${SAMBA_BASENAME}
-SAMBA_PRIVATEDIR?= ${SAMBA_CONFDIR}/${SAMBA_BASENAME}
-
-CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \
- --sysconfdir="${SAMBA_CONFDIR}" \
- --with-configdir="${SAMBA_CONFDIR}" \
- --includedir="${SAMBA_INCLUDEDIR}" \
- --datadir="${DATADIR}" \
- --with-swatdir="${SAMBA_SWATDIR}" \
- --libdir="${SAMBA_LIBDIR}" \
- --with-pammodulesdir="${SAMBA_LIBDIR}" \
- --with-modulesdir="${SAMBA_MODULEDIR}" \
- --localstatedir="${VARDIR}" \
- --with-piddir="${SAMBA_RUNDIR}" \
- --with-ncalrpcdir="${SAMBA_RUNDIR}/ncalrpc" \
- --with-nmbdsocketdir="${SAMBA_RUNDIR}/nmbd" \
- --with-lockdir="${SAMBA_LOCKDIR}" \
- --with-statedir="${SAMBA_LOCKDIR}" \
- --with-cachedir="${SAMBA_LOCKDIR}" \
- --with-privatedir="${SAMBA_PRIVATEDIR}" \
- --with-logfilebase="${SAMBA_LOGDIR}"
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread"
-# XXX: Temporary hack for RELENG6
-CONFIGURE_ENV+= ac_cv_header_sys_mount_h=yes
-# XXX: readdir test fails on ZFS, bringing unusable replacement code
-CONFIGURE_ENV+= libreplace_cv_READDIR_NEEDED=no
-# tdb
-BUILD_DEPENDS+= tdb>=1.2.6:databases/tdb
-RUN_DEPENDS+= tdb>=1.2.6:databases/tdb
-CONFIGURE_ARGS+= --without-libtdb --enable-external-libtdb
-# talloc
-BUILD_DEPENDS+= talloc>=2.0.1:devel/talloc
-RUN_DEPENDS+= talloc>=2.0.1:devel/talloc
-CONFIGURE_ARGS+= --without-libtalloc --enable-external-libtalloc
-# tevent
-BUILD_DEPENDS+= tevent>=0.9.11:devel/tevent
-RUN_DEPENDS+= tevent>=0.9.11:devel/tevent
-CONFIGURE_ARGS+= --without-libtevent --enable-external-libtevent
-# These options are common for all (sub)ports
-CONFIGURE_ARGS+= ${ICONV_CONFIGURE_BASE} \
- --disable-as-needed
-
-.if !defined(SAMBA_SUBPORT)
-OPTIONS_DEFINE= ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DNSUPDATE \
- DOCS EXAMPLES EXP_MODULES FAM IPV6 LDAP \
- MAX_DEBUG PAM_SMBPASS POPT PTHREADPOOL QUOTAS \
- SMBTORTURE SWAT SYSLOG UTMP WINBIND
-OPTIONS_RADIO= GSSAPI
-OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-
-OPTIONS_DEFAULT= ACL_SUPPORT AIO_SUPPORT CUPS LDAP POPT PTHREADPOOL \
- WINBIND GSSAPI_NONE
-
-ACL_SUPPORT_DESC= ACL support
-
-ADS_DESC= Active Directory support
-ADS_CONFIGURE_ON= --with-ads --with-krb5="${GSSAPIBASEDIR}"
-ADS_CONFIGURE_OFF= --without-ads --without-krb5
-
-AIO_SUPPORT_DESC= Asyncronous IO support
-DNSUPDATE_DESC= Dynamic DNS update(require ADS)
-EXP_MODULES_DESC= Experimental modules
-
-GSSAPI_BASE_DESC= Use Heimdal in base
-GSSAPI_BASE_USES= gssapi
-GSSAPI_HEIMDAL_DESC= Use Heimdal from ports
-GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
-GSSAPI_MIT_DESC= Use MIT Kerberos V5
-GSSAPI_MIT_USES= gssapi:mit,flags
-GSSAPI_NONE_DESC= No Kerberos support
-
-MAX_DEBUG_DESC= Maximum debugging
-PAM_SMBPASS_DESC= PAM authentication via passdb backends
-POPT_DESC= System-wide POPT library
-PTHREADPOOL_DESC= Pthread pool
-QUOTAS_DESC= Disk quota support
-SMBTORTURE_DESC= smbtorture
-SWAT_DESC= SWAT WebGUI
-UTMP_DESC= UTMP accounting support
-WINBIND_DESC= WinBIND support
-
-# !SAMBA_SUBPORT
-.endif
-
-.include <bsd.port.options.mk>
-
-# There are reports that on ARM PIE makes binaries to core dump(#149186)
-.if ${ARCH} == "arm"
-CONFIGURE_ARGS+= --disable-pie
-.endif
-
-.if defined(SAMBA_SUBPORT)
-# Switch off all extra functionality
-CONFIGURE_ARGS+= --disable-cups --disable-fam --without-winbind \
- --without-syslog --without-quotas --without-utmp \
- --without-pam --without-pam_smbpass \
- --without-aio-support --with-included-popt
-.else
-# Samba server itself
-USE_RC_SUBR= ${SAMBA_BASENAME}
-SUB_FILES= pkg-message smb.conf.sample
-
-PLIST= ${WRKDIR}/.PLIST
-# We don't (yet) have clustered FS for cluster support
-CONFIGURE_ARGS+= --with-pam --with-readline=/usr \
- --with-included-iniparser \
- --with-sendfile-support \
- --enable-largefile \
- --without-cluster-support \
- --without-libsmbclient \
- --without-libaddns \
- --without-libnetapi \
- --without-libsmbsharemodes
-
-.if ! ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ENV+= libreplace_cv_HAVE_IPV6=no
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-SAMBA_WANT_LDAP= yes
-.endif
-
-.if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+= libcups.so:print/cups
-CONFIGURE_ARGS+= --enable-cups --enable-iprint
-SUB_LIST+= CUPS=""
-.else
-CONFIGURE_ARGS+= --disable-cups --disable-iprint
-SUB_LIST+= CUPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMAX_DEBUG}
-CPPFLAGS+= -g
-LDFLAGS+= -g
-LIB_DEPENDS+= libdmalloc.so:devel/dmalloc
-CONFIGURE_ARGS+= --enable-debug
-# --enable-socket-wrapper --enable-nss-wrapper \
-# --enable-developer --enable-krb5developer \
-# --enable-dmalloc --with-profiling-data
-
-CONFIGURE_ARGS+= --with-smbtorture4-path=${WRKDIR}/${DISTNAME}/source4/torture
-.else
-CONFIGURE_ARGS+= --disable-debug \
- --disable-socket-wrapper --disable-nss-wrapper \
- --disable-developer --disable-krb5developer \
- --disable-dmalloc --without-profiling-data
-.endif
-
-.if ${PORT_OPTIONS:MSYSLOG}
-CONFIGURE_ARGS+= --with-syslog
-.else
-CONFIGURE_ARGS+= --without-syslog
-.endif
-
-.if ${PORT_OPTIONS:MQUOTAS}
-CONFIGURE_ARGS+= --with-quotas
-.else
-CONFIGURE_ARGS+= --without-quotas
-.endif
-
-.if ${PORT_OPTIONS:MUTMP}
-CONFIGURE_ARGS+= --with-utmp
-.else
-CONFIGURE_ARGS+= --without-utmp
-.endif
-
-.if ${PORT_OPTIONS:MWINBIND}
-CONFIGURE_ARGS+= --with-winbind
-PLIST_SUB+= WINBIND=""
-SUB_LIST+= WINBIND=""
-.else
-CONFIGURE_ARGS+= --without-winbind
-PLIST_SUB+= WINBIND="@comment "
-SUB_LIST+= WINBIND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSWAT}
-CONFIGURE_ARGS+= --enable-swat
-PLIST_SUB+= SWAT=""
-.else
-CONFIGURE_ARGS+= --disable-swat
-PLIST_SUB+= SWAT="@comment "
-.endif
-# Add some shared modules
-.if ${PORT_OPTIONS:MEXP_MODULES}
-. if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
-WANT_EXP_MODULES= idmap_tdb2 idmap_ad idmap_adex idmap_hash idmap_rid \
- charset_weird
-. if ! ${PORT_OPTIONS:MMAX_DEBUG}
-WANT_EXP_MODULES+= rpc_echo
-. endif
-WANT_EXP_MODULES+= vfs_cacheprime vfs_catia vfs_commit vfs_dirsort \
- vfs_readahead vfs_streams_depot vfs_syncops
-. endif
-.endif
-
-.if ${PORT_OPTIONS:MFAM}
-USES+= fam
-WANT_EXP_MODULES+= vfs_notify_fam
-CONFIGURE_ARGS+= --enable-fam
-.else
-CONFIGURE_ARGS+= --disable-fam
-.endif
-
-.if ${PORT_OPTIONS:MACL_SUPPORT}
-CONFIGURE_ARGS+= --with-acl-support
-WANT_EXP_MODULES+= vfs_zfsacl
-LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl
-.else
-CONFIGURE_ARGS+= --without-acl-support
-.endif
-
-.if ${PORT_OPTIONS:MAIO_SUPPORT}
-CONFIGURE_ARGS+= --with-aio-support
-.else
-CONFIGURE_ARGS+= --without-aio-support
-.endif
-
-.if ${PORT_OPTIONS:MPAM_SMBPASS}
-CONFIGURE_ARGS+= --with-pam_smbpass
-PLIST_SUB+= SMBPASS=""
-.else
-CONFIGURE_ARGS+= --without-pam_smbpass
-PLIST_SUB+= SMBPASS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDNSUPDATE}
-. if ! ${PORT_OPTIONS:MADS}
-IGNORE= dynamic DNS updates require ADS support. Disable DNSUPDATE support
-. endif
-LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid
-CONFIGURE_ARGS+= --with-dnsupdate
-.else
-CONFIGURE_ARGS+= --without-dnsupdate
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-CPPFLAGS+= `pkg-config --cflags avahi-client`
-CONFIGURE_ENV+= DNSSD_LIBS="`pkg-config --libs avahi-client`"
-LIB_DEPENDS+= libavahi-client.so:net/avahi-app
-CONFIGURE_ARGS+= --enable-avahi
-.else
-CONFIGURE_ARGS+= --disable-avahi
-.endif
-
-.if ${PORT_OPTIONS:MPTHREADPOOL}
-CONFIGURE_ARGS+= --enable-pthreadpool
-.else
-CONFIGURE_ARGS+= --disable-pthreadpool
-.endif
-
-.if ${PORT_OPTIONS:MPOPT}
-LIB_DEPENDS+= libpopt.so:devel/popt
-CONFIGURE_ARGS+= --without-included-popt
-.else
-CONFIGURE_ARGS+= --with-included-popt
-.endif
-
-.if ${PORT_OPTIONS:MSMBTORTURE}
-PLIST_SUB+= SMBTORTURE=""
-.else
-PLIST_SUB+= SMBTORTURE="@comment "
-.endif
-# !SAMBA_SUBPORT
-.endif
-
-###
-### Common part for port and it's subports
-###
-
-.if ${PORT_OPTIONS:MADS}
-. if ${PORT_OPTIONS:MGSSAPI_NONE}
-# Kerberos5 is necessary for ADS
-IGNORE= ADS support requires GSSAPI_BASE, GSSAPI_HEIMDAL, or GSSAPI_MIT
-. endif
-SAMBA_WANT_LDAP= yes
-.endif
-
-.if defined(SAMBA_WANT_LDAP)
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+= --with-ldap
-.else
-CONFIGURE_ARGS+= --without-ldap
-.endif
-
-.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
-CONFIGURE_ARGS+= --with-shared-modules="${WANT_EXP_MODULES:Q:C/(\\\\ )+/,/g}"
-.endif
-
-.include <bsd.port.pre.mk>
-
-post-patch:
- @${REINPLACE_CMD} -e 's|%%SAMBA_CONFIG%%|${SAMBA_CONFIG}|g' \
- ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/configure.in ${WRKSRC}/m4/aclocal.m4
- ${REINPLACE_CMD} -e '\|^Libs:|d; s|^#Libs:|Libs:|g' \
- ${WRKSRC}/pkgconfig/*.pc.in
-###
-### end of common part
-###
-
-.if !defined(SAMBA_SUBPORT)
-# Samba server only
-SAMBA_MAN1= dbwrap_tool.1 findsmb.1 \
- log2pcap.1 nmblookup.1 ntlm_auth.1 profiles.1 rpcclient.1 \
- sharesec.1 smbcacls.1 smbclient.1 smbcontrol.1 smbcquotas.1 \
- smbget.1 smbstatus.1 smbtar.1 smbtree.1 testparm.1 vfstest.1
-SAMBA_MAN5= lmhosts.5 smb.conf.5 smbgetrc.5 smbpasswd.5
-SAMBA_MAN7= samba.7
-SAMBA_MAN8= eventlogadm.8 net.8 nmbd.8 pdbedit.8 smbd.8 smbpasswd.8 \
- smbspool.8 idmap_nss.8 idmap_tdb.8 idmap_tdb2.8 \
- vfs_acl_tdb.8 vfs_acl_xattr.8 \
- vfs_audit.8 vfs_cap.8 vfs_default_quota.8 vfs_extd_audit.8 \
- vfs_fake_perms.8 vfs_full_audit.8 vfs_netatalk.8 \
- vfs_preopen.8 \
- vfs_readahead.8 vfs_readonly.8 vfs_recycle.8 vfs_shadow_copy.8 \
- vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \
- vfs_streams_xattr.8 vfs_xattr_tdb.8
-
-.if ${PORT_OPTIONS:MWINBIND}
-SAMBA_MAN1+= wbinfo.1
-SAMBA_MAN5+= pam_winbind.conf.5
-SAMBA_MAN7+= winbind_krb5_locator.7
-SAMBA_MAN8+= pam_winbind.8 winbindd.8
-.endif
-
-.if ${PORT_OPTIONS:MSWAT}
-SAMBA_MAN8+= swat.8
-.endif
-
-.if ${PORT_OPTIONS:MFAM}
-SAMBA_MAN8+= vfs_notify_fam.8
-.endif
-
-.if ${PORT_OPTIONS:MPTHREADPOOL}
-SAMBA_MAN8+= vfs_aio_pthread.8
-.endif
-
-.if defined(SAMBA_WANT_LDAP)
-SAMBA_MAN8+= idmap_ldap.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Midmap_ad)
-SAMBA_MAN8+= idmap_ad.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Midmap_adex)
-SAMBA_MAN8+= idmap_adex.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Midmap_hash)
-SAMBA_MAN8+= idmap_hash.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Midmap_rid)
-SAMBA_MAN8+= idmap_rid.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_cacheprime)
-SAMBA_MAN8+= vfs_cacheprime.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_catia)
-SAMBA_MAN8+= vfs_catia.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_commit)
-SAMBA_MAN8+= vfs_commit.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_dirsort)
-SAMBA_MAN8+= vfs_dirsort.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_streams_depot)
-SAMBA_MAN8+= vfs_streams_depot.8
-.endif
-
-SAMBA_SUB= SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
- SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
- SAMBA_CONFDIR="${SAMBA_CONFDIR}" \
- SAMBA_CONFIG="${SAMBA_CONFIG}" \
- SAMBA_RUNDIR="${SAMBA_RUNDIR}" \
- SAMBA_SWATDIR="${SAMBA_SWATDIR}" \
- SAMBA_SPOOL="${SAMBA_SPOOL}" \
- SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}" \
- PKGCONFIGDIR="${PKGCONFIGDIR_REL}"
-
-PLIST_SUB+= ${SAMBA_SUB}
-SUB_LIST+= ${SAMBA_SUB}
-
-ALL_TARGET= all
-.if ${PORT_OPTIONS:MSMBTORTURE}
-ALL_TARGET+= smbtorture
-.endif
-
-# What will be installed
-INSTALL_TARGET= installservers installbin installscripts installdat \
- installmodules installlibs
-
-.if ${PORT_OPTIONS:MSWAT}
-INSTALL_TARGET+=installswat
-.endif
-
-post-configure:
-# It's in another port
- @${RM} ${WRKDIR}/${DISTNAME}/docs/htmldocs/manpages/libsmbclient.7.html
- @${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient
-
-pre-install:
- -@${FIND} "${STAGEDIR}${SAMBA_MODULEDIR}" -type f -o -type l 2>/dev/null | ${SORT} | ${SED} -E 's|^${STAGEDIR}${PREFIX}/?||;' > ${WRKDIR}/.PLIST.exclude
- @${CAT} ${PKGDIR}/pkg-plist > ${PLIST}
-.if ${PORT_OPTIONS:MSWAT}
- @${CAT} ${PKGDIR}/pkg-plist.swat >> ${PLIST}
-.endif
-
-post-install:
- @${RM} ${STAGEDIR}/${PREFIX}/bin/findsmb
-.for sect in 1 3 5 7 8
- @${MKDIR} ${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect}
-. for man in ${SAMBA_MAN${sect}}
- @${INSTALL_MAN} "${WRKDIR}/${DISTNAME}/docs/manpages/${man}" "${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect}"
- ${ECHO_CMD} "man/man${sect}/${man}.gz" >> ${TMPPLIST}
-. endfor
-.endfor
-# Put examples in place
- @${MKDIR} "${STAGEDIR}${EXAMPLESDIR}"
- @${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* "${STAGEDIR}${EXAMPLESDIR}"
-.if ${PORT_OPTIONS:MPAM_SMBPASS}
- @${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/pam_smbpass"
- @${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* "${STAGEDIR}${EXAMPLESDIR}/pam_smbpass"
-.endif
- ${INSTALL_DATA} "${WRKDIR}/smb.conf.sample" "${STAGEDIR}${EXAMPLESDIR}/${SAMBA_CONFIG}.sample"
- ${INSTALL_DATA} "${WRKDIR}/smb.conf.sample" "${STAGEDIR}${SAMBA_CONFDIR}/${SAMBA_CONFIG}.sample"
- ${INSTALL_SCRIPT} "${WRKSRC}/script/mksmbpasswd.sh" "${STAGEDIR}${PREFIX}/bin/make_smbpasswd"
-# Winbind
-.if ${PORT_OPTIONS:MWINBIND}
- ${INSTALL_PROGRAM} "${WRKDIR}/${DISTNAME}/nsswitch/nss_winbind.so" "${STAGEDIR}${SAMBA_LIBDIR}/nss_winbind.so.1"
- ${INSTALL_PROGRAM} "${WRKDIR}/${DISTNAME}/nsswitch/nss_wins.so" "${STAGEDIR}${SAMBA_LIBDIR}/nss_wins.so.1"
- ${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${STAGEDIR}${SAMBA_LIBDIR}"
-.endif
-.if ${PORT_OPTIONS:MPAM_SMBPASS}
- ${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_smbpass.so" "${STAGEDIR}${SAMBA_LIBDIR}"
-.endif
-# smbtorture
-.if ${PORT_OPTIONS:MSMBTORTURE}
- ${INSTALL_PROGRAM} "${WRKSRC}/bin/smbtorture" "${STAGEDIR}${PREFIX}/bin"
-.endif
-# Lib
- @${FIND} "${STAGEDIR}${SAMBA_MODULEDIR}" -type f -o -type l | ${SED} -E 's|^${STAGEDIR}${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST}
- @for d in `${FIND} "${STAGEDIR}${SAMBA_MODULEDIR}" -type d | ${SORT} -r | ${SED} -E 's|^${STAGEDIR}${PREFIX}/?||;'`; do \
- ${ECHO_CMD} "@unexec rmdir >/dev/null 2>&1 \"%D/$$d\" || true" >> ${TMPPLIST}; \
- done
-# Documentation
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- @${CP} -Rp "${WRKDIR}/${DISTNAME}/docs/registry" "${STAGEDIR}${DOCSDIR}"
-. for f in Samba3-ByExample.pdf Samba3-HOWTO.pdf Samba3-Developers-Guide.pdf
- @${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/docs/${f}" "${STAGEDIR}${DOCSDIR}"
-. endfor
-. for f in README COPYING MAINTAINERS.txt PFIF.txt Manifest Roadmap \
- WHATSNEW.txt docs/THANKS docs/history
- @${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/${f}" "${STAGEDIR}${DOCSDIR}"
-. endfor
- @${INSTALL_DATA} "${FILESDIR}/README.FreeBSD" "${STAGEDIR}${DOCSDIR}"
-.endif
-# Run post-install script
-.for dir in ${SAMBA_SPOOL} ${SAMBA_LOGDIR} ${SAMBA_RUNDIR} ${SAMBA_LOCKDIR} ${SAMBA_PRIVATEDIR}
- @${MKDIR} "${STAGEDIR}${dir}"
-.endfor
- @${CHMOD} 1777 ${STAGEDIR}${SAMBA_SPOOL}
- @${CHMOD} 0700 ${STAGEDIR}${SAMBA_PRIVATEDIR}
- @${CAT} ${PKGMESSAGE}
-
-.if ${PORT_OPTIONS:MMAX_DEBUG}
-test:
- (cd ${WRKSRC} && ${MAKE_CMD} test_nss_modules test_pam_modules && ${MAKE_CMD} test)
-.endif
-# !SAMBA_SUBPORT
-.endif
-
-.include <bsd.port.post.mk>
Index: net/samba36/distinfo
===================================================================
--- net/samba36/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (samba-3.6.25.tar.gz) = 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
-SIZE (samba-3.6.25.tar.gz) = 34121828
-SHA256 (samba-3.6.25-security-2015-12-16.patch) = abe1ba1a73afe0865f20ac34a207c799cde29d34e736de5c2d029d532c93ac01
-SIZE (samba-3.6.25-security-2015-12-16.patch) = 8023
Index: net/samba36/files/README.FreeBSD
===================================================================
--- net/samba36/files/README.FreeBSD
+++ /dev/null
@@ -1,32 +0,0 @@
-If you want to run this port:
-
-1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf and edit
- it.
-2. Put string 'samba_enable="YES"' into your /etc/rc.conf.
-3. Run '/usr/local/etc/rc.d/samba start' or reboot.
-
-This port doesn't create 'smbpasswd' file automatically anymore. Users
-are encouraged to use 'tdbsam' backend instead:
-
- [global]
- passdb backend = tdbsam, smbpasswd
-
-You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam',
-see the Samba3-HOWTO-Collection.
-
-You still can create 'smbpasswd' file with the supplied 'make_smbpasswd'
-script:
-
- cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd
- chmod 600 smbpasswd
-
-But the usage of it is deprecated.
-
-See document files in /usr/local/share/doc/samba and example config files in
-/usr/local/share/examples/samba for details.
-
-This port doesn't come anymore with the IDEALX Samba LDAP management tools.
-They are a separate port now, net/smbldap-tools. Please, install it, if you
-are going to use Samba LDAP back end.
-
-FreeBSD Samba3 port maintainer: Timur I. Bakeyev <timur@FreeBSD.org>
Index: net/samba36/files/patch-lib__replace__system__wait.h
===================================================================
--- net/samba36/files/patch-lib__replace__system__wait.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./lib/replace/system/wait.h.orig 2010-04-01 15:26:22.000000000 +0200
-+++ ./lib/replace/system/wait.h 2010-04-23 01:08:35.000000000 +0200
-@@ -32,6 +32,18 @@
-
- #include <signal.h>
-
-+#ifndef SIGRTMIN
-+# ifdef NSIG
-+# define SIGRTMIN (NSIG+1)
-+# else
-+# define SIGRTMIN 33
-+# endif
-+#endif
-+
-+#ifndef SIGRTMAX
-+#define SIGRTMAX (SIGRTMIN+64)
-+#endif
-+
- #ifndef SIGCLD
- #define SIGCLD SIGCHLD
- #endif
Index: net/samba36/files/patch-lib__tevent__tevent_signal.c
===================================================================
--- net/samba36/files/patch-lib__tevent__tevent_signal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/tevent/tevent_signal.c.orig 2010-04-01 15:26:22.000000000 +0200
-+++ ./lib/tevent/tevent_signal.c 2010-04-23 01:08:35.000000000 +0200
-@@ -30,7 +30,7 @@
- #include "tevent_internal.h"
- #include "tevent_util.h"
-
--#define TEVENT_NUM_SIGNALS 64
-+#define TEVENT_NUM_SIGNALS (SIGRTMAX+1)
-
- /* maximum number of SA_SIGINFO signals to hold in the queue.
- NB. This *MUST* be a power of 2, in order for the ring buffer
Index: net/samba36/files/patch-nsswitch__pam_winbind.c
===================================================================
--- net/samba36/files/patch-nsswitch__pam_winbind.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./nsswitch/pam_winbind.c.orig 2011-08-09 13:17:47.000000000 +0200
-+++ ./nsswitch/pam_winbind.c 2011-09-06 23:23:18.000000000 +0200
-@@ -163,7 +163,6 @@
- }
- #endif
-
--
- /*
- * Work around the pam API that has functions with void ** as parameters
- * These lead to strict aliasing warnings with gcc.
-@@ -173,14 +172,20 @@
- const void *_item)
- {
- const void **item = (const void **)_item;
-- return pam_get_item(pamh, item_type, item);
-+ return pam_get_item((pam_handle_t *)pamh, item_type, item);
- }
-+
- static int _pam_get_data(const pam_handle_t *pamh,
- const char *module_data_name,
- const void *_data)
- {
-+#if PAM_GET_DATA_ARG3_CONST_VOID_PP
- const void **data = (const void **)_data;
-- return pam_get_data(pamh, module_data_name, data);
-+ return pam_get_data((pam_handle_t *)pamh, module_data_name, data);
-+#else
-+ void **data = (void **)_data;
-+ return pam_get_data((pam_handle_t *)pamh, module_data_name, data);
-+#endif
- }
-
- /* some syslogging */
-@@ -311,7 +316,7 @@
- if (item_type != 0) {
- pam_get_item(ctx->pamh, item_type, &data);
- } else {
-- pam_get_data(ctx->pamh, key, &data);
-+ _pam_get_data(ctx->pamh, key, &data);
- }
- if (data != NULL) {
- const char *type = (item_type != 0) ? "ITEM" : "DATA";
-@@ -2835,8 +2840,7 @@
- ret = PAM_USER_UNKNOWN;
- goto out;
- case 0:
-- pam_get_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD,
-- (const void **)&tmp);
-+ _pam_get_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, &tmp);
- if (tmp != NULL) {
- ret = atoi((const char *)tmp);
- switch (ret) {
Index: net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c
===================================================================
--- net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c
+++ /dev/null
@@ -1,100 +0,0 @@
---- ./nsswitch/winbind_nss_freebsd.c.orig 2012-10-02 08:24:41.000000000 +0000
-+++ ./nsswitch/winbind_nss_freebsd.c 2013-03-13 09:40:37.285778609 +0000
-@@ -5,6 +5,7 @@
- routines against Samba winbind/Windows NT Domain
-
- Copyright (C) Aaron Collins 2003
-+ Copyright (C) Timur I. Bakeyev 2013
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -53,6 +54,9 @@
- NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r);
- NSS_METHOD_PROTOTYPE(__nss_compat_setpwent);
- NSS_METHOD_PROTOTYPE(__nss_compat_endpwent);
-+NSS_METHOD_PROTOTYPE(__nss_compat_endpwent);
-+
-+NSS_METHOD_PROTOTYPE(__freebsd_getgroupmembership);
-
- static ns_mtab methods[] = {
- { NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r },
-@@ -60,6 +64,7 @@
- { NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r },
- { NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_winbind_setgrent },
- { NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_winbind_endgrent },
-+{ NSDB_GROUP, "getgroupmembership", __freebsd_getgroupmembership, NULL },
-
- { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r },
- { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r },
-@@ -69,6 +74,71 @@
-
- };
-
-+/* Taken from libc */
-+static int
-+gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt)
-+{
-+ int ret, dupc;
-+
-+ /* skip duplicates */
-+ for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) {
-+ if (groups[dupc] == gid)
-+ return 1;
-+ }
-+
-+ ret = 1;
-+ if (*grpcnt < maxgrp) /* add this gid */
-+ groups[*grpcnt] = gid;
-+ else
-+ ret = 0;
-+
-+ (*grpcnt)++;
-+
-+ return ret;
-+}
-+
-+/*
-+ rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
-+ defaultsrc, uname, agroup, groups, maxgrp, grpcnt);
-+*/
-+
-+int
-+__freebsd_getgroupmembership(void *retval, void *mdata, va_list ap)
-+{
-+ const char *uname = va_arg(ap, const char *);
-+ gid_t group = va_arg(ap, gid_t);
-+ gid_t *groups = va_arg(ap, gid_t *);
-+ int maxgrp = va_arg(ap, int);
-+ int *groupc = va_arg(ap, int *);
-+
-+ NSS_STATUS ret;
-+ long int lcount, lsize;
-+ int i, errnop;
-+ gid_t *tmpgroups;
-+
-+ /* Can be realloc() inside _nss_winbind_initgroups_dyn() */
-+ if ((tmpgroups=calloc(maxgrp, sizeof(gid_t))) == NULL) {
-+ errno = ENOMEM;
-+ return NS_TRYAGAIN;
-+ }
-+
-+ lcount = 0;
-+ lsize = maxgrp;
-+ /* insert primary membership(possibly already there) */
-+ gr_addgid(group, groups, maxgrp, groupc);
-+ /* Don't limit number of groups, we want to know total size */
-+ ret = _nss_winbind_initgroups_dyn(uname, group, &lcount, &lsize,
-+ &tmpgroups, 0, &errnop);
-+ if (ret == NSS_STATUS_SUCCESS) {
-+ /* lcount potentially can be bigger than maxgrp, so would groupc */
-+ for (i = 0; i < lcount; i++)
-+ gr_addgid(tmpgroups[i], groups, maxgrp, groupc);
-+ }
-+ free(tmpgroups);
-+ /* Let following nsswitch backend(s) add more groups(?) */
-+ return NSS_STATUS_NOTFOUND;
-+}
-+
- ns_mtab *
- nss_module_register(const char *source, unsigned int *mtabsize,
- nss_module_unregister_fn *unreg)
Index: net/samba36/files/patch-nsswitch__wins_freebsd.c
===================================================================
--- net/samba36/files/patch-nsswitch__wins_freebsd.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- ./nsswitch/wins_freebsd.c.orig 2010-04-23 01:08:35.000000000 +0200
-+++ ./nsswitch/wins_freebsd.c 2010-04-23 01:08:35.000000000 +0200
-@@ -0,0 +1,79 @@
-+/*
-+ Unix SMB/CIFS implementation.
-+
-+ Copyright (C) Timur I. Bakeyev 2007
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public
-+ License along with this library; if not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#include "winbind_client.h"
-+
-+NSS_STATUS _nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he,
-+ char *buffer, size_t buflen, int *h_errnop);
-+
-+NSS_METHOD_PROTOTYPE(__nss_wins_freebsd_gethostbyname2_r);
-+
-+static ns_mtab methods[] =
-+{
-+ { NSDB_HOSTS, "getaddrinfo", NULL, NULL },
-+ { NSDB_HOSTS, "ghbyname", NULL, NULL },
-+ { NSDB_HOSTS, "ghbyaddr", NULL, NULL },
-+ { NSDB_HOSTS, "gethostbyaddr_r", NULL, NULL },
-+ { NSDB_HOSTS, "gethostbyname2_r", __nss_wins_freebsd_gethostbyname2_r, _nss_wins_gethostbyname2_r },
-+ { NSDB_HOSTS, "getnetbyname_r", NULL, NULL },
-+ { NSDB_HOSTS, "getnetbyaddr_r", NULL, NULL },
-+ { NSDB_HOSTS, "gethostbyname", NULL, NULL },
-+ { NSDB_HOSTS, "gethostbyaddr", NULL, NULL },
-+ { NSDB_HOSTS, "getnetbyname", NULL, NULL },
-+ { NSDB_HOSTS, "getnetbyaddr", NULL, NULL }
-+};
-+
-+int
-+__nss_wins_freebsd_gethostbyname2_r(void *retval, void *mdata, va_list ap)
-+{
-+ int (*fn)(const char *, int, struct hostent *, char *, size_t, int *);
-+ const char *hostname;
-+ int af;
-+ struct hostent *he;
-+ char *buffer;
-+ size_t buflen;
-+ int *h_errnop;
-+ enum nss_status status;
-+
-+ fn = mdata;
-+ hostname = va_arg(ap, const char *);
-+ af = va_arg(ap, int);
-+ he = va_arg(ap, struct hostent *);
-+ buffer = va_arg(ap, char *);
-+ buflen = va_arg(ap, size_t);
-+ h_errnop = va_arg(ap, int *);
-+
-+ status = fn(hostname, af, he, buffer, buflen, h_errnop);
-+ status = __nss_compat_result(status, *h_errnop);
-+ if (status == NS_SUCCESS)
-+ *(struct hostent **)retval = he;
-+
-+ return (status);
-+}
-+
-+ns_mtab *
-+nss_module_register(const char *source __unused, unsigned int *mtabsize,
-+ nss_module_unregister_fn *unreg)
-+{
-+ *mtabsize = sizeof(methods) / sizeof(methods[0]);
-+ *unreg = NULL;
-+ return (methods);
-+}
Index: net/samba36/files/patch-source3__Makefile.in
===================================================================
--- net/samba36/files/patch-source3__Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
---- ./source3/Makefile.in.orig 2013-06-19 07:35:24.000000000 +0000
-+++ ./source3/Makefile.in 2013-06-30 04:26:08.399888796 +0000
-@@ -151,7 +151,7 @@
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
- LOGFILEBASE = @logfilebase@
--CONFIGFILE = $(CONFIGDIR)/smb.conf
-+CONFIGFILE = $(CONFIGDIR)/%%SAMBA_CONFIG%%
- LMHOSTSFILE = $(CONFIGDIR)/lmhosts
- NCALRPCDIR = @ncalrpcdir@
-
-@@ -1305,8 +1305,8 @@
- $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBNDR_GEN_OBJ0)
-
--WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \
-- $(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNMB_OBJ)
-+WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o @WINBIND_WINS_NSS_EXTRA_OBJS@ \
-+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNMB_OBJ)
-
- PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
- pam_smbpass/pam_smb_acct.o pam_smbpass/support.o ../lib/util/asn1.o
-@@ -1623,6 +1623,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .c .o .lo
-+.SUFFIXES: .h .h.gch
-
- .PHONY: showflags SHOWFLAGS
-
-@@ -1684,6 +1685,9 @@
- $(COMPILE_CC) >/dev/null 2>&1
- @BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@
-
-+.h.h.gch:
-+ @echo Compiling $*.h
-+
- PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
-
- # this adds support for precompiled headers. To use it, install a snapshot
-@@ -2856,9 +2860,9 @@
- $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
- @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
-
--bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
-+bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
- @echo "Linking $@"
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
- $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
-
- bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBWBCLIENT)
-@@ -3215,7 +3219,8 @@
- @echo "Linking shared library $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \
- $(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-- $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS)
-+ $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) \
-+ @SONAMEFLAG@`basename $@`
-
- bin/tdbbackup@EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) $(LIBTALLOC) $(LIBTDB)
- @echo Linking $@
Index: net/samba36/files/patch-source3__configure.in
===================================================================
--- net/samba36/files/patch-source3__configure.in
+++ /dev/null
@@ -1,210 +0,0 @@
---- ./source3/configure.in.orig 2013-01-18 10:41:08.000000000 +0000
-+++ ./source3/configure.in 2013-01-30 01:24:19.349878982 +0000
-@@ -864,9 +864,13 @@
- AC_PATH_PROG(CUPS_CONFIG, cups-config)
-
- if test "x$CUPS_CONFIG" != x; then
-+ ac_save_PRINT_CPPFLAGS=$CPPFLAGS
-+ ac_save_PRINT_LDFLAGS=$LDFLAGS
-
-- ac_save_LDFLAGS=$LDFLAGS
- ac_save_PRINT_LIBS=$PRINT_LIBS
-+ CPPFLAGS="$CPPFLAGS `$CUPS_CONFIG --cflags`"
-+ LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-+
- AC_CHECK_HEADERS(cups/cups.h cups/language.h)
-
- if test x"$ac_cv_header_cups_cups_h" = xyes -a \
-@@ -875,7 +879,7 @@
- # underlinked. With cups-config --libs we pull in unwanted and unneeded
- # dendencies including thread libraries - use cups-config only if really
- # required.
-- AC_CHECK_LIB_EXT(cups, ac_save_PRINT_LIBS , httpConnect,
-+ AC_CHECK_LIB_EXT(cups, ac_save_PRINT_LIBS, httpConnect,
- [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`"])
-@@ -885,10 +889,10 @@
- AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)
- else
- AC_MSG_WARN([cups-config around but cups-devel not installed])
-- CFLAGS=$ac_save_CFLAGS
-- LDFLAGS=$ac_save_LDFLAGS
- PRINT_LIBS=$ac_save_PRINT_LIBS
- fi
-+ CPPFLAGS=$ac_save_PRINT_CPPFLAGS
-+ LDFLAGS=$ac_save_PRINT_LDFLAGS
-
- 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.)
-@@ -1845,7 +1849,7 @@
- fi
-
- if test x"$BLDSHARED" = x"true" ; then
-- LDFLAGS="$LDFLAGS -L./bin"
-+ LDFLAGS="-L./bin $LDFLAGS"
- fi
-
- AC_MSG_RESULT($BLDSHARED)
-@@ -1976,9 +1980,6 @@
- AC_MSG_CHECKING([PICFLAG])
- AC_MSG_RESULT([$PICFLAG])
-
--AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
--AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
--
- AC_CACHE_CHECK([whether building shared libraries actually works],
- [ac_cv_shlib_works],[
- # try building a trivial shared library
-@@ -4656,15 +4657,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])
-- fi
-+ fi
- create_pam_modules=no
-- fi
-+ fi
-
- if test x"$use_pam" = x"yes"; then
-- AC_DEFINE(WITH_PAM,1,[Whether to include PAM support])
-+ AC_DEFINE(WITH_PAM,1,[Whether to include PAM support])
- AC_DEFINE(HAVE_LIBPAM,1,[Whether libpam is available])
- AUTH_LIBS="$AUTH_LIBS $PAM_LIBS"
-- with_pam_for_crypt=yes
-+ with_pam_for_crypt=yes
-+
-+ AC_VERIFY_C_PROTOTYPE(
-+ [int pam_get_data(const pam_handle_t *pamh, const char *module_data_name, const void **data)],
-+ [return 0;],
-+ [AC_DEFINE(PAM_GET_DATA_ARG3_CONST_VOID_PP, 1, [Whether pam_get_data 3 argument is a const pointer to pointer])],
-+ [
-+ dnl Old OpenPAM declaration
-+ AC_VERIFY_C_PROTOTYPE(
-+ [int pam_get_data(pam_handle_t *pamh, const char *module_data_name, void **data)],
-+ [return 0;],
-+ [AC_DEFINE(PAM_GET_DATA_ARG3_VOID_PP, 1, [Whether pam_get_data 3 argument is a void pointer to pointer])],
-+ [], [
-+ #include <sys/types.h>
-+ #if HAVE_SECURITY_PAM_APPL_H
-+ #include <security/pam_appl.h>
-+ #endif
-+ #if HAVE_PAM_PAM_APPL_H
-+ #include <pam/pam_appl.h>
-+ #endif
-+ #if HAVE_SECURITY_PAM_MODULES_H
-+ #include <security/pam_modules.h>
-+ #endif
-+ ]
-+ )],[
-+ #include <sys/types.h>
-+ #if HAVE_SECURITY_PAM_APPL_H
-+ #include <security/pam_appl.h>
-+ #endif
-+ #if HAVE_PAM_PAM_APPL_H
-+ #include <pam/pam_appl.h>
-+ #endif
-+ #if HAVE_SECURITY_PAM_MODULES_H
-+ #include <security/pam_modules.h>
-+ #endif
-+ ]
-+ )
-
- if test x"$create_pam_modules" = x"yes"; then
- AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
-@@ -4674,7 +4711,7 @@
- AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
- AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
- else
-- AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])
-+ AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])
- fi
- fi
- AC_MSG_CHECKING(whether to use PAM support)
-@@ -5877,7 +5914,7 @@
-
- AC_MSG_CHECKING(for aio_suspend)
- AC_LINK_IFELSE([#include <aio.h>
--int main() { struct aiocb a; struct timespec t; return aio_suspend(&a, 1, &t); }],
-+int main() { struct aiocb *a[[1]]; struct timespec t; return aio_suspend((const struct aiocb**)&a, 1, &t); }],
- [AC_DEFINE(HAVE_AIO_SUSPEND, 1, [Have aio_suspend]) AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
- fi
-@@ -6336,12 +6373,13 @@
- NSSSONAMEVERSIONSUFFIX=".2"
- WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
- ;;
-- *freebsd[[5-9]]*)
-+ *freebsd*)
- # FreeBSD winbind client is implemented as a wrapper around
- # the Linux version.
- NSSSONAMEVERSIONSUFFIX=".1"
- WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \
- ../nsswitch/winbind_nss_linux.o"
-+ WINBIND_WINS_NSS_EXTRA_OBJS="../nsswitch/wins_freebsd.o"
- WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
- WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
- ;;
-@@ -6488,10 +6526,14 @@
- AC_MSG_RESULT(no$winbind_no_reason)
- fi
-
-+AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
-+AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
-+
- AC_SUBST(WINBIND_NSS)
- AC_SUBST(WINBIND_WINS_NSS)
- AC_SUBST(WINBIND_NSS_LDSHFLAGS)
- AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
-+AC_SUBST(WINBIND_WINS_NSS_EXTRA_OBJS)
- AC_SUBST(NSSSONAMEVERSIONSUFFIX)
-
- AC_SUBST(WINBIND_KRB5_LOCATOR)
-@@ -6810,13 +6852,21 @@
- # Start
- AC_CHECK_FUNC(getmntent)
-
--AC_CHECK_HEADERS(sys/statfs.h)
-+AC_CHECK_HEADERS(sys/statfs.h sys/mount.h)
-
- AC_MSG_CHECKING([vfs_fileid: checking for statfs() and struct statfs.f_fsid)])
- AC_CACHE_VAL(vfsfileid_cv_statfs,[
- AC_TRY_RUN([
- #include <sys/types.h>
-+ #ifdef HAVE_SYS_PARAM_H
-+ #include <sys/param.h>
-+ #endif
-+ #ifdef HAVE_SYS_MOUNT_H
-+ #include <sys/mount.h>
-+ #endif
-+ #ifdef HAVE_SYS_STATFS_H
- #include <sys/statfs.h>
-+ #endif
- int main(void)
- {
- struct statfs fsd;
-@@ -7116,6 +7166,16 @@
- LIBS="$LIBS -ldmalloc"
- fi
-
-+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
-+
-+if test "x$enable_dmalloc" = xyes
-+then
-+ AC_DEFINE(ENABLE_DMALLOC, 1, [Define to turn on dmalloc debugging])
-+ AC_DEFINE(DMALLOC_FUNC_CHECK, 1,
-+ [Define to check invariants around some common functions])
-+ LIBS="$LIBS -ldmalloc"
-+fi
-+
- dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
- LIB_REMOVE_USR_LIB(LDFLAGS)
- LIB_REMOVE_USR_LIB(LIBS)
-@@ -7164,6 +7224,7 @@
- AC_SUBST(SMBD_LIBS)
-
- CFLAGS="${CFLAGS} \$(FLAGS)"
-+CFLAGS="${CFLAGS} -I%%LOCALBASE%%/include"
- CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
-
- # If we had to expand the includes, make tsure the output file is moved back
Index: net/samba36/files/patch-source3__include__includes.h
===================================================================
--- net/samba36/files/patch-source3__include__includes.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./source3/include/includes.h.orig 2011-08-09 13:17:47.000000000 +0200
-+++ ./source3/include/includes.h 2011-10-04 00:34:33.000000000 +0200
-@@ -161,6 +161,10 @@
- #include <sys/uio.h>
- #endif
-
-+#ifdef HAVE_SYS_SYSCTL_H
-+#include <sys/sysctl.h>
-+#endif
-+
- #if HAVE_LANGINFO_H
- #include <langinfo.h>
- #endif
-@@ -548,10 +552,6 @@
- #define SIGCLD SIGCHLD
- #endif
-
--#ifndef SIGRTMIN
--#define SIGRTMIN NSIG
--#endif
--
- #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS)
- #define OSF1_ENH_SEC 1
- #endif
Index: net/samba36/files/patch-source3__lib__fault.c
===================================================================
--- net/samba36/files/patch-source3__lib__fault.c
+++ /dev/null
@@ -1,164 +0,0 @@
---- ./source3/lib/fault.c.orig 2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/lib/fault.c 2010-04-23 01:08:35.000000000 +0200
-@@ -26,6 +26,10 @@
- #endif
-
-
-+#ifdef HAVE_SYS_SYSCTL_H
-+#include <sys/sysctl.h>
-+#endif
-+
- #ifdef HAVE_SYS_PRCTL_H
- #include <sys/prctl.h>
- #endif
-@@ -144,52 +148,93 @@
- * before dump_core() calls abort.
- */
- #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
--static char *get_freebsd_corepath(void)
-+/*
-+ * Expand the name described in corefilename, using name, uid, and pid.
-+ * corefilename is a printf-like string, with three format specifiers:
-+ * %N name of process ("name")
-+ * %P process id (pid)
-+ * %U user id (uid)
-+ * For example, "%N.core" is the default; they can be disabled completely
-+ * by using "/dev/null", or all core files can be stored in "/cores/%U/%N-%P".
-+ */
-+static char *get_freebsd_corepath(const char *name)
- {
-- char *tmp_corepath = NULL;
-- char *end = NULL;
-- size_t len = 128;
-+ TALLOC_CTX *tmp_ctx;
-+ char format[MAXPATHLEN];
-+ char *freebsd_corepath = NULL, *buffer = NULL;
-+ char *start, *end;
-+ size_t len;
- int ret;
-
-- /* Loop with increasing sizes so we don't allocate too much. */
-- do {
-- if (len > 1024) {
-- goto err_out;
-- }
--
-- tmp_corepath = (char *)talloc_realloc(NULL, tmp_corepath,
-- char, len);
-- if (!tmp_corepath) {
-- return NULL;
-- }
--
-- ret = sysctlbyname("kern.corefile", tmp_corepath, &len, NULL,
-- 0);
-- if (ret == -1) {
-- if (errno != ENOMEM) {
-- DEBUG(0, ("sysctlbyname failed getting "
-- "kern.corefile %s\n",
-- strerror(errno)));
-- goto err_out;
-- }
--
-- /* Not a large enough array, try a bigger one. */
-- len = len << 1;
-- }
-- } while (ret == -1);
--
-+ len = sizeof(format);
-+ /* Read format string */
-+ if((ret = sysctlbyname("kern.corefile", format, &len, NULL, 0)) == -1) {
-+ return NULL;
-+ }
- /* Strip off the common filename expansion */
-- if ((end = strrchr_m(tmp_corepath, '/'))) {
-+ if ((end=strrchr_m(format, '/')) != NULL) {
- *end = '\0';
- }
-+ /* Core file is relative to the cwd */
-+ if(!format[0] || format[0] != '/') {
-+ return NULL;
-+ }
-
-- return tmp_corepath;
--
-- err_out:
-- if (tmp_corepath) {
-- talloc_free(tmp_corepath);
-+ if((tmp_ctx = talloc_new(NULL)) == NULL) {
-+ DEBUG(0, ("talloc_new failed\n"));
-+ return NULL;
- }
-- return NULL;
-+ if((buffer = talloc_strdup(tmp_ctx, "")) == NULL) {
-+ DEBUG(0, ("talloc_strdup: Out of memory!\n"));
-+ goto failed;
-+ }
-+ /* Parse format string and expand variables */
-+ start = format;
-+ while((end=strchr_m(start, '%')) != NULL) {
-+ /* Copy part of the string without format arguments */
-+ if(end != start) {
-+ buffer = talloc_strndup_append_buffer(buffer, start, end - start);
-+ if(buffer == NULL) {
-+ DEBUG(0, ("talloc_strdup: Out of memory!\n"));
-+ goto failed;
-+ }
-+ }
-+ start = end + 1;
-+ switch (*start) {
-+ case '%':
-+ buffer = talloc_strdup_append_buffer(buffer, "%%");
-+ break;
-+ case 'N': /* process name */
-+ buffer = talloc_asprintf_append_buffer(buffer, "%s", name);
-+ break;
-+ case 'P': /* process id */
-+ buffer = talloc_asprintf_append_buffer(buffer, "%u", getpid());
-+ break;
-+ case 'U': /* user id */
-+ buffer = talloc_asprintf_append_buffer(buffer, "%u", getuid());
-+ break;
-+ default:
-+ DEBUG(0,(
-+ "Unknown format character %c in "
-+ "corename `%s'\n", *start, format));
-+ }
-+ if(buffer == NULL) {
-+ DEBUG(0, ("talloc_asprintf_append_buffer: Out of memory!\n"));
-+ goto failed;
-+ }
-+ start++;
-+ }
-+ /* Copy remaining part, if any */
-+ if((buffer = talloc_strdup_append_buffer(buffer, start)) == NULL) {
-+ DEBUG(0, ("talloc_strdup_append_buffer: Out of memory!\n"));
-+ goto failed;
-+ }
-+ /* Duplicate assembled string in the unattached contenxt */
-+ freebsd_corepath = talloc_strdup(NULL, buffer);
-+failed:
-+ TALLOC_FREE(tmp_ctx);
-+
-+ return freebsd_corepath;
- }
- #endif
-
-@@ -248,8 +293,7 @@
- {
- #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
- char *tmp_corepath = NULL;
-- tmp_corepath = get_freebsd_corepath();
--
-+ tmp_corepath = get_freebsd_corepath(progname);
- /* If this has been set correctly, we're done. */
- if (tmp_corepath) {
- return tmp_corepath;
-@@ -327,7 +371,7 @@
- SAFE_FREE(logbase);
- }
-
-- void dump_core(void)
-+void dump_core(void)
- {
- static bool called;
-
Index: net/samba36/files/patch-source3__lib__system.c
===================================================================
--- net/samba36/files/patch-source3__lib__system.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./source3/lib/system.c.orig 2011-08-09 13:17:47.000000000 +0200
-+++ ./source3/lib/system.c 2011-10-13 23:38:02.000000000 +0200
-@@ -2586,14 +2586,14 @@
- }
-
- /*******************************************************************
-- An aio_fsync wrapper that will deal with 64-bit sizes.
-+ An aio_suspend wrapper that will deal with 64-bit sizes.
- ********************************************************************/
-
- int sys_aio_suspend(const SMB_STRUCT_AIOCB * const cblist[], int n, const struct timespec *timeout)
- {
- #if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_AIOCB64) && defined(HAVE_AIO_SUSPEND64)
- return aio_suspend64(cblist, n, timeout);
--#elif defined(HAVE_AIO_FSYNC)
-+#elif defined(HAVE_AIO_SUSPEND)
- return aio_suspend(cblist, n, timeout);
- #else
- errno = ENOSYS;
Index: net/samba36/files/patch-source3__m4__aclocal.m4
===================================================================
--- net/samba36/files/patch-source3__m4__aclocal.m4
+++ /dev/null
@@ -1,163 +0,0 @@
---- ./source3/m4/aclocal.m4.orig 2012-09-14 08:12:09.000000000 +0000
-+++ ./source3/m4/aclocal.m4 2012-10-20 13:13:36.975802862 +0000
-@@ -385,7 +385,7 @@
- ac_new_flags=""
- for i in [$]$1; do
- case [$]i in
-- -I/usr/include|-I/usr/include/) ;;
-+ -I/usr/include|-I/usr/include/|-I%%LOCALBASE%%/include/|-I%%LOCALBASE%%/include) f=1;;
- *) ac_new_flags="[$]ac_new_flags [$]i" ;;
- esac
- done
-@@ -437,104 +437,81 @@
- dnl those with the standalone portable libiconv installed).
- AC_MSG_CHECKING(for iconv in $1)
- jm_cv_func_iconv="no"
-+ jm_cv_include=""
- jm_cv_lib_iconv=""
-- jm_cv_giconv=no
-+ jm_cv_giconv="no"
- jm_save_LIBS="$LIBS"
-
-- dnl Check for include in giconv.h but no lib needed
-- if test "$jm_cv_func_iconv" != yes; then
-- AC_TRY_LINK([#include <stdlib.h>
-+ dnl Check for include in funny place but no lib needed
-+ if test "$jm_cv_func_iconv" != yes; then
-+ AC_TRY_LINK([#include <stdlib.h>
- #include <giconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
-- jm_cv_func_iconv=yes
-- jm_cv_include="giconv.h"
-- jm_cv_giconv="yes"
-- jm_cv_lib_iconv="")
-+ jm_cv_func_iconv=yes
-+ jm_cv_include="giconv.h"
-+ jm_cv_lib_iconv=""
-+ jm_cv_giconv="yes")
-
-- dnl Standard iconv.h include, lib in glibc or libc ...
-- if test "$jm_cv_func_iconv" != yes; then
-- AC_TRY_LINK([#include <stdlib.h>
-+ dnl Standard iconv.h include, lib in glibc or libc ...
-+ if test "$jm_cv_func_iconv" != yes; then
-+ AC_TRY_LINK([#include <stdlib.h>
- #include <iconv.h>],
-- [iconv_t cd = iconv_open("","");
-+ [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
-- jm_cv_include="iconv.h"
-- jm_cv_func_iconv=yes
-- jm_cv_lib_iconv="")
--
-- dnl Include in giconv.h, libgiconv needed to link
-- if test "$jm_cv_func_iconv" != yes; then
-- jm_save_LIBS="$LIBS"
-- LIBS="$LIBS -lgiconv"
-- AC_TRY_LINK([#include <stdlib.h>
-+ jm_cv_func_iconv=yes
-+ jm_cv_include="iconv.h"
-+ jm_cv_lib_iconv="")
-+
-+ dnl Include in giconv.h, libgiconv needed to link
-+ if test "$jm_cv_func_iconv" != yes; then
-+ jm_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lgiconv"
-+ AC_TRY_LINK([#include <stdlib.h>
- #include <giconv.h>],
-- [iconv_t cd = iconv_open("","");
-+ [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
-- jm_cv_lib_iconv=yes
- jm_cv_func_iconv=yes
- jm_cv_include="giconv.h"
-- jm_cv_giconv=yes
-- jm_cv_lib_iconv="giconv")
-+ jm_cv_lib_iconv="giconv"
-+ jm_cv_giconv=yes)
-
-- LIBS="$jm_save_LIBS"
-+ LIBS="$jm_save_LIBS"
-
-- dnl Include in iconv.h, libiconv needed to link
-- if test "$jm_cv_func_iconv" != yes; then
-- jm_save_LIBS="$LIBS"
-- LIBS="$LIBS -liconv"
-- AC_TRY_LINK([#include <stdlib.h>
-+ dnl Include in iconv.h, libiconv needed to link
-+ if test "$jm_cv_func_iconv" != yes; then
-+ jm_save_LIBS="$LIBS"
-+ LIBS="$LIBS -liconv"
-+ AC_TRY_LINK([#include <stdlib.h>
- #include <iconv.h>],
-- [iconv_t cd = iconv_open("","");
-- iconv(cd,NULL,NULL,NULL,NULL);
-- iconv_close(cd);],
-- jm_cv_include="iconv.h"
-- jm_cv_func_iconv=yes
-- jm_cv_lib_iconv="iconv")
-- LIBS="$jm_save_LIBS"
--
-- dnl Include in biconv.h, libbiconv needed to link
-- if test "$jm_cv_func_iconv" != yes; then
-- jm_save_LIBS="$LIBS"
-- LIBS="$LIBS -lbiconv"
-- AC_TRY_LINK([#include <stdlib.h>
--#include <biconv.h>],
-- [iconv_t cd = iconv_open("","");
-- iconv(cd,NULL,NULL,NULL,NULL);
-- iconv_close(cd);],
-- jm_cv_lib_iconv=yes
-- jm_cv_func_iconv=yes
-- jm_cv_include="biconv.h"
-- jm_cv_biconv=yes
-- jm_cv_lib_iconv="biconv")
-+ [iconv_t cd = iconv_open("","");
-+ iconv(cd,NULL,NULL,NULL,NULL);
-+ iconv_close(cd);],
-+ jm_cv_func_iconv=yes
-+ jm_cv_include="iconv.h"
-+ jm_cv_lib_iconv="iconv")
-
-- LIBS="$jm_save_LIBS"
-- fi
-- fi
-+ LIBS="$jm_save_LIBS"
-+ fi
-+ fi
- fi
- fi
-- fi
-- if test "$jm_cv_func_iconv" = yes; then
-- if test "$jm_cv_giconv" = yes; then
-- AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
-- AC_MSG_RESULT(yes)
-- ICONV_FOUND=yes
-- else
-- if test "$jm_cv_biconv" = yes; then
-- AC_DEFINE(HAVE_BICONV, 1, [What header to include for iconv() function: biconv.h])
-- AC_MSG_RESULT(yes)
-- ICONV_FOUND=yes
-+ if test "$jm_cv_func_iconv" = yes; then
-+ if test "$jm_cv_giconv" = yes; then
-+ AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
-+ AC_MSG_RESULT(yes)
-+ ICONV_FOUND=yes
- else
- AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
- AC_MSG_RESULT(yes)
- ICONV_FOUND=yes
- fi
-+ else
-+ AC_MSG_RESULT(no)
- fi
-- else
-- AC_MSG_RESULT(no)
-- fi
- ])
-
- AC_DEFUN(rjs_CHARSET,[
Index: net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c
===================================================================
--- net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ./source3/modules/vfs_shadow_copy2.c.orig 2012-10-19 03:37:47.475803452 +0000
-+++ ./source3/modules/vfs_shadow_copy2.c 2012-10-19 03:39:42.665808023 +0000
-@@ -237,7 +237,7 @@
- if (shadow_copy2_match_name(fname, &gmt_start)) { \
- char *name2; \
- rtype ret; \
-- name2 = convert_shadow2_name(handle, fname, gmt_start); \
-+ name2 = convert_shadow2_name(handle, fname, gmt_start, True); \
- if (name2 == NULL) { \
- errno = EINVAL; \
- return eret; \
-@@ -258,7 +258,7 @@
- char *name2; \
- char *smb_base_name_tmp = NULL; \
- rtype ret; \
-- name2 = convert_shadow2_name(handle, smb_fname->base_name, gmt_start); \
-+ name2 = convert_shadow2_name(handle, smb_fname->base_name, gmt_start, True); \
- if (name2 == NULL) { \
- errno = EINVAL; \
- return eret; \
-@@ -285,7 +285,7 @@
- if (shadow_copy2_match_name(fname, &gmt_start)) { \
- char *name2; \
- NTSTATUS ret; \
-- name2 = convert_shadow2_name(handle, fname, gmt_start); \
-+ name2 = convert_shadow2_name(handle, fname, gmt_start, True); \
- if (name2 == NULL) { \
- errno = EINVAL; \
- return eret; \
-@@ -409,7 +409,8 @@
- convert a filename from a share relative path, to a path in the
- snapshot directory
- */
--static char *convert_shadow2_name(vfs_handle_struct *handle, const char *fname, const char *gmt_path)
-+static char *convert_shadow2_name(vfs_handle_struct *handle, const char *fname,
-+ const char *gmt_path, const bool incl_rel)
- {
- TALLOC_CTX *tmp_ctx = talloc_new(handle->data);
- const char *snapdir, *relpath, *baseoffset, *basedir;
-@@ -486,11 +487,13 @@
- if (*relpath == '/') relpath++;
- if (*baseoffset == '/') baseoffset++;
-
-- ret = talloc_asprintf(handle->data, "%s/%s/%s/%s",
-+ ret = talloc_asprintf(handle->data, "%s/%s%s%s%s%s",
- snapdir,
- snapshot,
-+ *baseoffset ? "/" : "",
- baseoffset,
-- relpath);
-+ *relpath ? "/" : "",
-+ incl_rel ? relpath : "");
- DEBUG(6,("convert_shadow2_name: '%s' -> '%s'\n", fname, ret));
- talloc_free(tmp_ctx);
- return ret;
-@@ -687,68 +690,17 @@
- static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle,
- const char *fname)
- {
-- TALLOC_CTX *tmp_ctx;
-- const char *snapdir, *baseoffset, *basedir, *gmt_start;
-- size_t baselen;
-+ const char *gmt_start;
- char *ret;
-
- DEBUG(10, ("shadow_copy2_connectpath called with %s\n", fname));
-
- if (!shadow_copy2_match_name(fname, &gmt_start)) {
-- return handle->conn->connectpath;
-- }
--
-- /*
-- * We have to create a real temporary context because we have
-- * to put our result on talloc_tos(). Thus we can't use a
-- * talloc_stackframe() here.
-- */
-- tmp_ctx = talloc_new(talloc_tos());
--
-- fname = shadow_copy2_normalise_path(tmp_ctx, fname, gmt_start);
-- if (fname == NULL) {
-- TALLOC_FREE(tmp_ctx);
-- return NULL;
-- }
--
-- snapdir = shadow_copy2_find_snapdir(tmp_ctx, handle);
-- if (snapdir == NULL) {
-- DEBUG(2,("no snapdir found for share at %s\n",
-- handle->conn->connectpath));
-- TALLOC_FREE(tmp_ctx);
-- return NULL;
-+ return SMB_VFS_NEXT_CONNECTPATH(handle, fname);
- }
-
-- basedir = shadow_copy2_find_basedir(tmp_ctx, handle);
-- if (basedir == NULL) {
-- DEBUG(2,("no basedir found for share at %s\n",
-- handle->conn->connectpath));
-- TALLOC_FREE(tmp_ctx);
-- return NULL;
-- }
--
-- baselen = strlen(basedir);
-- baseoffset = handle->conn->connectpath + baselen;
--
-- /* some sanity checks */
-- if (strncmp(basedir, handle->conn->connectpath, baselen) != 0 ||
-- (handle->conn->connectpath[baselen] != 0
-- && handle->conn->connectpath[baselen] != '/')) {
-- DEBUG(0,("shadow_copy2_connectpath: basedir %s is not a "
-- "parent of %s\n", basedir,
-- handle->conn->connectpath));
-- TALLOC_FREE(tmp_ctx);
-- return NULL;
-- }
--
-- if (*baseoffset == '/') baseoffset++;
--
-- ret = talloc_asprintf(talloc_tos(), "%s/%.*s/%s",
-- snapdir,
-- GMT_NAME_LEN, fname,
-- baseoffset);
-+ ret = convert_shadow2_name(handle, fname, gmt_start, False);
- DEBUG(6,("shadow_copy2_connectpath: '%s' -> '%s'\n", fname, ret));
-- TALLOC_FREE(tmp_ctx);
- return ret;
- }
-
Index: net/samba36/files/patch-source3__smbd__quotas.c
===================================================================
--- net/samba36/files/patch-source3__smbd__quotas.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./source3/smbd/quotas.c.orig 2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/smbd/quotas.c 2010-04-23 01:08:35.000000000 +0200
-@@ -1235,6 +1235,7 @@
- if (!cutstr)
- return False;
-
-+ memset(&D, '\0', sizeof(D));
- memset(cutstr, '\0', len+1);
- host = strncat(cutstr,mnttype, sizeof(char) * len );
- DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr));
-@@ -1243,7 +1244,7 @@
- args.gqa_pathp = testpath+1;
- args.gqa_uid = uid;
-
-- DEBUG(5,("nfs_quotas: Asking for host \"%s\" rpcprog \"%i\" rpcvers \"%i\" network \"%s\"\n", host, RQUOTAPROG, RQUOTAVERS, "udp"));
-+ DEBUG(5,("nfs_quotas: Asking for host \"%s\" rpcprog \"%lu\" rpcvers \"%lu\" network \"%s\"\n", host, RQUOTAPROG, RQUOTAVERS, "udp"));
-
- if ((clnt = clnt_create(host, RQUOTAPROG, RQUOTAVERS, "udp")) == NULL) {
- ret = False;
Index: net/samba36/files/patch-source3__smbd__statvfs.c
===================================================================
--- net/samba36/files/patch-source3__smbd__statvfs.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- ./source3/smbd/statvfs.c.orig 2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/smbd/statvfs.c 2010-04-23 01:08:35.000000000 +0200
-@@ -3,6 +3,7 @@
- VFS API's statvfs abstraction
- Copyright (C) Alexander Bokovoy 2005
- Copyright (C) Steve French 2005
-+ Copyright (C) Timur I. Bakeyev 2005
- Copyright (C) James Peach 2006
-
- This program is free software; you can redistribute it and/or modify
-@@ -49,9 +50,42 @@
- }
- return result;
- }
--#endif
-+#elif defined(FREEBSD)
-+static int bsd_statvfs(const char *path, vfs_statvfs_struct *statbuf)
-+{
-+ struct statfs statfs_buf;
-+ int result;
-+
-+ result = statfs(path, &statfs_buf);
-+ if(result != 0) {
-+ return result;
-+ }
-+
-+ statbuf->OptimalTransferSize = statfs_buf.f_iosize;
-+ statbuf->BlockSize = statfs_buf.f_bsize;
-+ statbuf->TotalBlocks = statfs_buf.f_blocks;
-+ statbuf->BlocksAvail = statfs_buf.f_bfree;
-+ statbuf->UserBlocksAvail = statfs_buf.f_bavail;
-+ statbuf->TotalFileNodes = statfs_buf.f_files;
-+ statbuf->FreeFileNodes = statfs_buf.f_ffree;
-+ statbuf->FsIdentifier =
-+ (((uint64_t)statfs_buf.f_fsid.val[0]<<32) & 0xffffffff00000000LL) | (uint64_t)statfs_buf.f_fsid.val[1];
-+ /* Try to extrapolate some of the fs flags into the
-+ * capabilities
-+ */
-+ statbuf->FsCapabilities =
-+ FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES;
-+ if(statfs_buf.f_flags & MNT_ACLS)
-+ statbuf->FsCapabilities |= FILE_PERSISTENT_ACLS;
-+ if(statfs_buf.f_flags & MNT_QUOTA)
-+ statbuf->FsCapabilities |= FILE_VOLUME_QUOTAS;
-+ if(statfs_buf.f_flags & MNT_RDONLY)
-+ statbuf->FsCapabilities |= FILE_READ_ONLY_VOLUME;
-
--#if defined(DARWINOS)
-+ return 0;
-+}
-+
-+#elif defined(DARWINOS)
-
- #include <sys/attr.h>
-
-@@ -137,6 +171,8 @@
- {
- #if defined(LINUX) && defined(HAVE_FSID_INT)
- return linux_statvfs(path, statbuf);
-+#elif defined(FREEBSD)
-+ return bsd_statvfs(path, statbuf);
- #elif defined(DARWINOS)
- return darwin_statvfs(path, statbuf);
- #else
Index: net/samba36/files/patch-source3__utils__net.c
===================================================================
--- net/samba36/files/patch-source3__utils__net.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./source3/utils/net.c.orig 2013-01-29 08:49:31.000000000 +0000
-+++ ./source3/utils/net.c 2013-01-31 15:04:24.069877314 +0000
-@@ -898,8 +898,13 @@
- set_global_myname(c->opt_requester_name);
- }
-
-- if (!c->opt_user_name && getenv("LOGNAME")) {
-- c->opt_user_name = getenv("LOGNAME");
-+ if (!c->opt_user_name) {
-+ if(getenv("LOGNAME"))
-+ c->opt_user_name = getenv("LOGNAME");
-+ else
-+ d_fprintf(stderr,
-+ _("Environment LOGNAME is not defined."
-+ " Trying anonymous access.\n"));
- }
-
- if (!c->opt_workgroup) {
Index: net/samba36/files/patch-source3__utils__net_time.c
===================================================================
--- net/samba36/files/patch-source3__utils__net_time.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./source3/utils/net_time.c.orig 2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/utils/net_time.c 2010-04-23 01:08:35.000000000 +0200
-@@ -87,10 +87,15 @@
- if (!tm) {
- return "unknown";
- }
--
-+#if defined(FREEBSD)
-+ return talloc_asprintf(talloc_tos(), "%02d%02d%02d%02d%02d.%02d",
-+ tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday,
-+ tm->tm_hour, tm->tm_min, tm->tm_sec);
-+#else
- return talloc_asprintf(talloc_tos(), "%02d%02d%02d%02d%04d.%02d",
- tm->tm_mon+1, tm->tm_mday, tm->tm_hour,
- tm->tm_min, tm->tm_year + 1900, tm->tm_sec);
-+#endif
- }
-
- int net_time_usage(struct net_context *c, int argc, const char **argv)
Index: net/samba36/files/pkg-message.in
===================================================================
--- net/samba36/files/pkg-message.in
+++ /dev/null
@@ -1,7 +0,0 @@
-===============================================================================
-Samba3 *package* now doesn't include ADS support due the portability problems
-with Kerberos5 libraries on different installations. You need to compile the
-port yourself to get this functionality.
-
-For additional hints and directions, please, look into the README.FreeBSD file.
-===============================================================================
Index: net/samba36/files/samba.in
===================================================================
--- net/samba36/files/samba.in
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: nmbd smbd
-%%WINBIND%%# PROVIDE: winbindd
-# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv
-%%CUPS%%# REQUIRE: cupsd
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-#samba_enable="YES"
-# You can disable/enable any of the Samba daemons by specifying:
-#nmbd_enable="NO"
-#smbd_enable="NO"
-%%WINBIND%%# You need to enable winbindd separately, by adding:
-%%WINBIND%%#winbindd_enable="YES"
-#
-# Configuration file can be set with:
-#samba_config="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
-#
-
-. /etc/rc.subr
-
-name="samba"
-rcvar=samba_enable
-# Custom commands
-extra_commands="reload status"
-start_precmd="samba_start_precmd"
-start_cmd="samba_cmd"
-stop_cmd="samba_cmd"
-status_cmd="samba_cmd"
-restart_precmd="samba_checkconfig"
-reload_precmd="samba_checkconfig"
-reload_cmd="samba_reload_cmd"
-rcvar_cmd="samba_rcvar_cmd"
-# Defaults
-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=
-#
-samba_daemons="nmbd smbd"
-%%WINBIND%%samba_daemons="${samba_daemons} winbindd"
-
-samba_checkconfig() {
- echo -n "Performing sanity check on Samba configuration: "
- if ${testparm_command} -s ${samba_config:+"${samba_config}"} >/dev/null 2>&1; then #"
- echo "OK"
- else
- echo "FAILED"
- return 1
- fi
- return 0
-}
-
-samba_start_precmd() {
- # Make sure rundir exists
- if [ ! -d "%%SAMBA_RUNDIR%%" -a ! -e "%%SAMBA_RUNDIR%%" ]; then
- install -m 0755 -d "%%SAMBA_RUNDIR%%"
- fi
- # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
- if [ -n "${samba_lockdir}" -a -d "${samba_lockdir}" ]; then
- echo -n "Removing stale Samba tdb files: "
- for file in brlock.tdb browse.dat connections.tdb gencache.tdb \
- locking.tdb messages.tdb namelist.debug sessionid.tdb \
- unexpected.tdb
- do
- rm "${samba_lockdir}/${file}" </dev/null 2>/dev/null && echo -n '.'
- done
- echo " done"
- fi
-}
-
-samba_rcvar_cmd() {
- local name rcvar
- rcvar=${name}_enable
- # Prevent recursive calling
- unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
- # Check master variable
- run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
- # Check dependent variables
- for name in ${samba_daemons}; do
- # XXX
- rcvars=''; v=''
- rcvar=${name}_enable
- run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
- done
-}
-
-samba_reload_cmd() {
- local name rcvar command pidfile force_run
- # Prevent recursive calling
- unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
- # Ignore rcvar and run command
- if [ -n "${_rc_prefix}" -a "${_rc_prefix}" = "one" ] || [ -n "${rc_force}" ] || [ -n "${rc_fast}" ]; then
- force_run=yes
- fi
- # Apply to all daemons
- for name in ${samba_daemons}; do
- rcvar=${name}_enable
- command="%%PREFIX%%/sbin/${name}"
- pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
- # Daemon should be enabled and running
- if ( [ -n "${rcvar}" ] && checkyesno "${rcvar}" ) || [ -n "$force_run" ]; then
- if [ -n "$(check_pidfile "${pidfile}" "${command}")" ]; then
- debug "reloading ${name} configuration"
- echo "Reloading ${name}."
- # XXX: Hack with pid_extra
- ${smbcontrol_command} "${name}${pid_extra}" 'reload-config' ${command_args} >/dev/null 2>&1
- fi
- fi
- done
-}
-
-samba_cmd() {
- local name rcvar rcvars v command pidfile samba_daemons result force_run
- # Prevent recursive calling
- unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
- # Stop processes in the reverse order
- if [ "${rc_arg}" = "stop" ] ; then
- samba_daemons=$(reverse_list ${samba_daemons})
- fi
- # Ignore rcvar and run command
- if [ -n "${_rc_prefix}" -a "${_rc_prefix}" = "one" ] || [ -n "${rc_force}" ] || [ -n "${rc_fast}" ]; then
- force_run=yes
- fi
- # Assume success
- result=0
- # Apply to all daemons
- for name in ${samba_daemons}; do
- # XXX
- rcvars=''; v=''
- rcvar=${name}_enable
- command="%%PREFIX%%/sbin/${name}"
- pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
- # Daemon should be enabled and running
- if ( [ -n "${rcvar}" ] && checkyesno "${rcvar}" ) || [ -n "$force_run" ]; then
- run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
- # If any of the commands failed, take it as a global result
- result=$((${result} || $?))
- fi
- done
- return ${result}
-}
-
-samba_config_init() {
- local name
- # Load configuration
- load_rc_config "${name}"
- for name in ${samba_daemons}; do
- load_rc_config "${name}"
- done
- # Location of the config
- samba_config=${samba_config="${samba_config_default}"} #"
- # XXX: Hack to work around name change of pid file with non-default config
- if [ -n "${samba_config}" -a "${samba_config}" != "${samba_config_default}" ]; then
- pid_extra="-$(basename "${samba_config}")"
- fi
- # Defaults
- samba_enable=${samba_enable:=NO}
- # Setup dependent variables
- if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
- nmbd_enable=${nmbd_enable=YES}
- smbd_enable=${smbd_enable=YES}
- fi
- nmbd_enable=${nmbd_enable:=NO}
- smbd_enable=${smbd_enable:=NO}
-%%WINBIND%% # Winbindd
-%%WINBIND%% if [ -z "${winbind_enable}" ]; then
-%%WINBIND%% samba_idmap=$(${samba_parm} 'idmap uid' "${samba_config}" 2>/dev/null)
-%%WINBIND%% # Check that winbindd is actually configured
-%%WINBIND%% if [ -n "${samba_idmap}" ]; then
-%%WINBIND%% winbindd_enable="YES"
-%%WINBIND%% fi
-%%WINBIND%% winbindd_enable=${winbindd_enable:=NO}
-%%WINBIND%% fi
-}
-
-# Load configuration variables
-samba_config_init
-# Where is the lockdir
-samba_lockdir=$(${samba_parm} 'lock directory' "${samba_config}" 2>/dev/null)
-# Common flags
-command_args=${samba_config:+-s "${samba_config}"} #"
-nmbd_flags=${nmbd_flags="-D"}
-smbd_flags=${smbd_flags="-D"}
-%%WINBIND%%winbindd_flags=${winbindd_flags=''}
-# Requirements
-required_files="${samba_config}"
-required_dirs="${samba_lockdir}"
-
-run_rc_command "$1"
Index: net/samba36/files/sernet.patch
===================================================================
--- net/samba36/files/sernet.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-samba3-3.4-honor-all-loopback-ips.patch
-samba3.6-veto-speedup.patch
-
-commit b6afe7ef236a454d8a6abf104b8846f817378f73
-Author: Björn Jacke <bj@sernet.de>
-Date: Thu Oct 15 02:02:30 2009 +0200
-
- util: cope the all loopback addresses IPv4 knows
-
- The fact that we just recogniced 127.0.0.1 as loopback IP address and not the
- rest of the 127.0.0.0/8 IP address range we used the lo interface for sending
- packages even though we should send them to some more physical interface. This
- way we ended up with failing WINS registration and so on like in #6348.
- On the lo interface sendto() returned "Invalid Argument" (EINVAL).
-
-diff --git a/lib/util/util_net.c b/lib/util/util_net.c
-index 0ce495e..0511a28 100644
---- a/lib/util/util_net.c
-+++ b/lib/util/util_net.c
-@@ -353,13 +353,11 @@
- }
-
- /**
-- * Check if an IPv7 is 127.0.0.1
-+ * Check if an IPv4 is in IN_LOOPBACKNET (127.0.0.0/8)
- */
- bool is_loopback_ip_v4(struct in_addr ip)
- {
-- struct in_addr a;
-- a.s_addr = htonl(INADDR_LOOPBACK);
-- return(ip.s_addr == a.s_addr);
-+ return ((ntohl(ip.s_addr) & IN_CLASSA_NET) == (IN_LOOPBACKNET << IN_CLASSA_NSHIFT));
- }
-
- /**
-From 944f10760f1bd0e839e08f1204b68e9c06617cf1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
-Date: Thu, 19 Apr 2012 13:33:50 +0200
-Subject: [PATCH] s3: speed up reply when vetoed files are being accessed
-
-one usecase of this fast-path is when non-existing files are being tried to be
-opened that are vetoed anyway. With this modification we look if the pattern is
-vetoed first and immediately tell the client that the file doesn't exist
-instead of searching for it in the first place and later on say we don't have
-it regardless.
----
- source3/smbd/filename.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
-index b2ed239..67138e7 100644
---- a/source3/smbd/filename.c
-+++ b/source3/smbd/filename.c
-@@ -1284,6 +1284,13 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
-
- *pp_smb_fname = NULL;
-
-+ status = check_veto_path(conn, name_in);
-+ if (!NT_STATUS_IS_OK(status)) {
-+ DEBUG(10,("file %s matches veto path - fast path returning %s\n",
-+ name_in, nt_errstr(status)));
-+ return status;
-+ }
-+
- status = resolve_dfspath_wcard(ctx, conn,
- dfs_path,
- name_in,
Index: net/samba36/files/smb.conf.sample.in
===================================================================
--- net/samba36/files/smb.conf.sample.in
+++ /dev/null
@@ -1,306 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba,
-# read the Samba-HOWTO-Collection. This may be obtained from:
-# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the
-# Samba-Guide which is generated daily and can be downloaded from:
-# http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# Any line which starts with a ; (semi-colon) or a # (hash)
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors.
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
- workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
- server string = Samba Server
-
-# Security mode. Defines in which mode Samba will operate. Possible
-# values are share, user, server, domain and ads. Most people will want
-# user level security. See the Samba-HOWTO-Collection for details.
- security = user
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-; hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
- load printers = yes
-
-# you may wish to override the location of the printcap file
-; printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-; printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-; printing = cups
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-; guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
- log file = %%SAMBA_LOGDIR%%/log.%m
-
-# Put a capping on the size of the log files (in Kb).
- max log size = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-# password server = *
-; password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-; realm = MY_REALM
-
-# Backend to store user information in. New installations should
-# use either tdbsam or ldapsam. smbpasswd is available for backwards
-# compatibility. tdbsam requires no further configuration.
-; passdb backend = tdbsam
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-# this line. The included file is read at that point.
-; include = %%SAMBA_CONFDIR%%/smb.conf.%m
-
-# Most people will find that this option gives better performance.
-# See the chapter 'Samba performance issues' in the Samba HOWTO Collection
-# and the manual pages for details.
-# You may want to add the following on a Linux system:
-; socket options = SO_RCVBUF=8192 SO_SNDBUF=8192
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-; interfaces = 192.168.12.2/24 192.168.13.2/24
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-; local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-; os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-; domain master = yes
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-; preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for
-# Windows95 workstations.
-; domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-; logon script = %m.bat
-# run a specific logon batch file per username
-; logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-# %L substitutes for this servers netbios name, %U is username
-# You must uncomment the [Profiles] share below
-; logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-; wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-; wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one WINS Server on the network. The default is NO.
-; wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
- dns proxy = no
-
-# Charset settings
-; display charset = koi8-r
-; unix charset = koi8-r
-; dos charset = cp866
-
-# Use extended attributes to store file modes
-; store dos attributes = yes
-; map hidden = no
-; map system = no
-; map archive = no
-
-# Use inherited ACLs for directories
-; nt acl support = yes
-; inherit acls = yes
-; map acl inherit = yes
-
-# These scripts are used on a domain controller or stand-alone
-# machine to add or delete corresponding unix accounts
-; add user script = /usr/sbin/useradd %u
-; add group script = /usr/sbin/groupadd %g
-; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-; delete user script = /usr/sbin/userdel %u
-; delete user from group script = /usr/sbin/deluser %u %g
-; delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-[homes]
- comment = Home Directories
- browseable = no
- writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-; comment = Network Logon Service
-; path = /usr/local/samba/lib/netlogon
-; guest ok = yes
-; writable = no
-; share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-; path = /usr/local/samba/profiles
-; browseable = no
-; guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to
-# specifically define each individual printer
-[printers]
- comment = All Printers
- path = %%SAMBA_SPOOL%%
- browseable = no
-# Set public = yes to allow user 'guest account' to print
- guest ok = no
- writable = no
- printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-; comment = Temporary file space
-; path = /tmp
-; read only = no
-; public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-; comment = Public Stuff
-; path = /home/samba
-; public = yes
-; writable = yes
-; printable = no
-; write list = @staff
-
-# Other examples.
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-; comment = Fred's Printer
-; valid users = fred
-; path = /homes/fred
-; printer = freds_printer
-; public = no
-; writable = no
-; printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-; comment = Fred's Service
-; path = /usr/somewhere/private
-; valid users = fred
-; public = no
-; writable = yes
-; printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-; comment = PC Directories
-; path = /usr/pc/%m
-; public = no
-; writable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-; path = /usr/somewhere/else/public
-; public = yes
-; only guest = yes
-; writable = yes
-; printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-; comment = Mary's and Fred's stuff
-; path = /usr/somewhere/shared
-; valid users = mary fred
-; public = no
-; writable = yes
-; printable = no
-; create mask = 0765
-;
-
-# This is a DRAFT sample configuration for the ACLs on the ZFS partition.
-#
-; nt acl support = yes
-; inherit acls = no
-; map acl inherit = yes
-;
-;[zpool]
-; path = /tank/zpool
-; unix extensions = no
-; vfs objects = zfsacl
-; nfs4:mode = special
-; nfs4:acedup = merge
-; nfs4:chown = yes
Index: net/samba36/pkg-descr
===================================================================
--- net/samba36/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-The Samba suite is a set of programs which run under the FreeBSD
-operating system. These programs deliver most of the important
-functionality of a Microsoft Lan Manager server. That is, they support
-remote access to FreeBSD filespace and FreeBSD printers from Lan Manager
-compatible clients. In practical terms, this means that such clients can
-connect to and use FreeBSD filespace as if it was a local disk drive, or
-FreeBSD printers as if they were local printers.
-
-Some of the most popular Lan Manager compatible clients include Lan
-Manager itself, Windows for Workgroups, OS/2 and Windows NT.
-
-WWW: http://www.samba.org/
Index: net/samba36/pkg-plist
===================================================================
--- net/samba36/pkg-plist
+++ /dev/null
@@ -1,215 +0,0 @@
-etc/%%SAMBA_CONFIG%%.sample
-bin/eventlogadm
-bin/make_smbpasswd
-bin/net
-bin/nmblookup
-bin/ntlm_auth
-bin/pdbedit
-bin/profiles
-bin/rpcclient
-bin/sharesec
-bin/smbcacls
-bin/smbclient
-bin/smbcontrol
-bin/smbcquotas
-bin/smbget
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
-bin/smbta-util
-bin/smbtar
-bin/smbtree
-bin/testparm
-%%SMBTORTURE%%bin/smbtorture
-%%WINBIND%%bin/wbinfo
-%%WINBIND%%include/wbclient.h
-sbin/smbd
-sbin/nmbd
-%%SWAT%%sbin/swat
-%%WINBIND%%sbin/winbindd
-%%WINBIND%%lib/libwbclient.so
-%%WINBIND%%lib/libwbclient.so.0
-%%WINBIND%%lib/nss_winbind.so.1
-%%WINBIND%%lib/nss_wins.so.1
-%%WINBIND%%lib/pam_winbind.so
-%%SMBPASS%%lib/pam_smbpass.so
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/%%SAMBA_CONFIG%%.sample
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/convertSambaAccount
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/get_next_oid
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/ol-schema-migrate.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba-nds.schema
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba-schema-FDS.ldif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x.README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba.ldif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba.schema
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba.schema.at.IBM-DS
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba.schema.oc.IBM-DS
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/Makefile.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/autogen.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/config.guess
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/config.sub
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/configure
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/configure.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/install-sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/module_config.h.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/shadow_copy_test.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/skel_opaque.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/skel_transparent.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/ad-bench.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/settings.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/test_utils.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_group.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_join.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_kinit.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_ldap.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_user.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/utils.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/auth_skel.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/crackcheck/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/crackcheck/crackcheck.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/autofs/auto.smb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0001-leave-the-question-section-in-update-responses.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0002-prevent-a-valgrind-uninitialised-memory-warning.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0003-don-t-compress-TSIG-names.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0004-If-tkey-gssapi-initialisation-fails-then-heck-for-th.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0005-windows-doesn-t-return-valid-GSSAPI-sequence-numbers.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dce-dfs/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dce-dfs/smb.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/genlogon/genlogon.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/mklogon/mklogon.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/mklogon/mklogon.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/ntlogon/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/ntlogon/ntlogon.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/ntlogon/ntlogon.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/adssearch.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/check_multiple_LDAP_entries.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/cldap.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/extra_smbstatus
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/swat.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/wall.perl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nss/nss_winbind.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nss/nss_winbind.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nss/wbtest.c
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/README
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/kdc-pdc
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-mature
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-migration
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-sync
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pam_winbind/pam_winbind.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/COPYING
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/closerequest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/closerequest.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ethernet.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ethernet.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ip.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ip.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/main.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxrequest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxrequest.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxresponse.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxresponse.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/readandxrequest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/readandxrequest.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/readandxresponse.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/smb.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/smb.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/tcp.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/tcp.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/writeandxrequest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/writeandxrequest.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdb/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdb/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdb/test.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_cpu.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_disk.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_mem.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_process.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_util.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perfcountd.init
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/acct-all
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/acct-sum
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/hp5-redir
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/lp-acct
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/printcap
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/VampireDriversFunctions
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/prtpub.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/readme.prtpub
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/smbprint
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/smbprint.sysv
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/debugging/linux/backtrace
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/debugging/solaris/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/debugging/solaris/solaris-oops.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/eventlog/parselog.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/idmap/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/idmap/idmap_nis.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mount/mount.smbfs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/printing/cups/smbaddprinter.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/printing/cups/smbdelprinter.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/perl/modify_samba_config.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/SambaConfig.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/SambaParm.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/generate_parm_table.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/modify_samba_config.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/smbparm.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/users_and_groups/adduserstogroups.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/users_and_groups/createdomobj.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/wins_hook/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/wins_hook/dns_update
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smb.conf.default
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf.WinNT
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf.fjall
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf.lapland
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf.vittjokk
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/msdos70.out
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/nwdos70.out
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/readme
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/validchr.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/validchr.com
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS.txt
-%%PORTDOCS%%%%DOCSDIR%%/Manifest
-%%PORTDOCS%%%%DOCSDIR%%/PFIF.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%%%DOCSDIR%%/Roadmap
-%%PORTDOCS%%%%DOCSDIR%%/Samba3-ByExample.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Samba3-Developers-Guide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Samba3-HOWTO.pdf
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
-%%PORTDOCS%%%%DOCSDIR%%/history
-%%PORTDOCS%%%%DOCSDIR%%/registry/FolderRedir.adm
-%%PORTDOCS%%%%DOCSDIR%%/registry/NT4-Locking.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/NT4_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win-2Kx-XPP-DeleteCachedProfiles.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win-2Kx-XPP-ForceLocalProfile.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win-NT-DeleteRoamingProfile.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win2000_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win7_Samba3DomainMember.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win95_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win98_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win9X-CacheHandling.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/WinME_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/WinXP_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/WindowsTerminalServer.reg
-@dir %%SAMBA_PRIVATEDIR%%
-@dir %%SAMBA_LOCKDIR%%
-@dir %%SAMBA_LOGDIR%%
-@dir %%SAMBA_SPOOL%%
-@dir %%SAMBA_RUNDIR%%/nmbd
-@dir %%SAMBA_RUNDIR%%
Index: net/samba36/pkg-plist.swat
===================================================================
--- net/samba36/pkg-plist.swat
+++ /dev/null
@@ -1,345 +0,0 @@
-share/swat/help/Samba3-ByExample/Big500users.html
-share/swat/help/Samba3-ByExample/DMSMig.html
-share/swat/help/Samba3-ByExample/DomApps.html
-share/swat/help/Samba3-ByExample/ExNetworks.html
-share/swat/help/Samba3-ByExample/HA.html
-share/swat/help/Samba3-ByExample/RefSection.html
-share/swat/help/Samba3-ByExample/apa.html
-share/swat/help/Samba3-ByExample/appendix.html
-share/swat/help/Samba3-ByExample/ch14.html
-share/swat/help/Samba3-ByExample/go01.html
-share/swat/help/Samba3-ByExample/happy.html
-share/swat/help/Samba3-ByExample/images/AccountingNetwork.png
-share/swat/help/Samba3-ByExample/images/Charity-Network.png
-share/swat/help/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
-share/swat/help/Samba3-ByExample/images/HostAnnouncment.png
-share/swat/help/Samba3-ByExample/images/LocalMasterAnnouncement.png
-share/swat/help/Samba3-ByExample/images/NullConnect.png
-share/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
-share/swat/help/Samba3-ByExample/images/UserConnect.png
-share/swat/help/Samba3-ByExample/images/UserMgrNT4.png
-share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
-share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
-share/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
-share/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
-share/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
-share/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
-share/swat/help/Samba3-ByExample/images/XP-screen001.png
-share/swat/help/Samba3-ByExample/images/acct2net.png
-share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
-share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
-share/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
-share/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
-share/swat/help/Samba3-ByExample/images/ch8-migration.png
-share/swat/help/Samba3-ByExample/images/chap4-net.png
-share/swat/help/Samba3-ByExample/images/chap5-net.png
-share/swat/help/Samba3-ByExample/images/chap6-net.png
-share/swat/help/Samba3-ByExample/images/chap7-idresol.png
-share/swat/help/Samba3-ByExample/images/chap7-net-A.png
-share/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
-share/swat/help/Samba3-ByExample/images/chap7-net.png
-share/swat/help/Samba3-ByExample/images/chap7-net2-B.png
-share/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
-share/swat/help/Samba3-ByExample/images/chap7-net2.png
-share/swat/help/Samba3-ByExample/images/chap7-net2r.png
-share/swat/help/Samba3-ByExample/images/chap7-netr.png
-share/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
-share/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
-share/swat/help/Samba3-ByExample/images/imc-usermanager2.png
-share/swat/help/Samba3-ByExample/images/lam-config.png
-share/swat/help/Samba3-ByExample/images/lam-group-members.png
-share/swat/help/Samba3-ByExample/images/lam-groups.png
-share/swat/help/Samba3-ByExample/images/lam-hosts.png
-share/swat/help/Samba3-ByExample/images/lam-login.png
-share/swat/help/Samba3-ByExample/images/lam-users.png
-share/swat/help/Samba3-ByExample/images/openmag.png
-share/swat/help/Samba3-ByExample/images/wxpp001.png
-share/swat/help/Samba3-ByExample/images/wxpp004.png
-share/swat/help/Samba3-ByExample/images/wxpp006.png
-share/swat/help/Samba3-ByExample/images/wxpp007.png
-share/swat/help/Samba3-ByExample/images/wxpp008.png
-share/swat/help/Samba3-ByExample/images/wxpp010.png
-share/swat/help/Samba3-ByExample/images/wxpp011.png
-share/swat/help/Samba3-ByExample/images/wxpp012.png
-share/swat/help/Samba3-ByExample/images/wxpp013.png
-share/swat/help/Samba3-ByExample/images/wxpp015.png
-share/swat/help/Samba3-ByExample/index.html
-share/swat/help/Samba3-ByExample/ix01.html
-share/swat/help/Samba3-ByExample/kerberos.html
-share/swat/help/Samba3-ByExample/net2000users.html
-share/swat/help/Samba3-ByExample/ntmigration.html
-share/swat/help/Samba3-ByExample/nw4migration.html
-share/swat/help/Samba3-ByExample/pr01.html
-share/swat/help/Samba3-ByExample/pr02.html
-share/swat/help/Samba3-ByExample/pr03.html
-share/swat/help/Samba3-ByExample/preface.html
-share/swat/help/Samba3-ByExample/primer.html
-share/swat/help/Samba3-ByExample/secure.html
-share/swat/help/Samba3-ByExample/simple.html
-share/swat/help/Samba3-ByExample/small.html
-share/swat/help/Samba3-ByExample/unixclients.html
-share/swat/help/Samba3-ByExample/upgrades.html
-share/swat/help/Samba3-Developers-Guide/CodingSuggestions.html
-share/swat/help/Samba3-Developers-Guide/Packaging.html
-share/swat/help/Samba3-Developers-Guide/architecture.html
-share/swat/help/Samba3-Developers-Guide/contributing.html
-share/swat/help/Samba3-Developers-Guide/debug.html
-share/swat/help/Samba3-Developers-Guide/devprinting.html
-share/swat/help/Samba3-Developers-Guide/index.html
-share/swat/help/Samba3-Developers-Guide/internals.html
-share/swat/help/Samba3-Developers-Guide/modules.html
-share/swat/help/Samba3-Developers-Guide/ntdomain.html
-share/swat/help/Samba3-Developers-Guide/parsing.html
-share/swat/help/Samba3-Developers-Guide/pr01.html
-share/swat/help/Samba3-Developers-Guide/pt01.html
-share/swat/help/Samba3-Developers-Guide/pt02.html
-share/swat/help/Samba3-Developers-Guide/pt03.html
-share/swat/help/Samba3-Developers-Guide/pt04.html
-share/swat/help/Samba3-Developers-Guide/pt05.html
-share/swat/help/Samba3-Developers-Guide/pwencrypt.html
-share/swat/help/Samba3-Developers-Guide/rpc-plugin.html
-share/swat/help/Samba3-Developers-Guide/tracing.html
-share/swat/help/Samba3-Developers-Guide/unix-smb.html
-share/swat/help/Samba3-Developers-Guide/vfs.html
-share/swat/help/Samba3-Developers-Guide/wins.html
-share/swat/help/Samba3-HOWTO/AccessControls.html
-share/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
-share/swat/help/Samba3-HOWTO/Appendix.html
-share/swat/help/Samba3-HOWTO/Backup.html
-share/swat/help/Samba3-HOWTO/CUPS-printing.html
-share/swat/help/Samba3-HOWTO/ChangeNotes.html
-share/swat/help/Samba3-HOWTO/ClientConfig.html
-share/swat/help/Samba3-HOWTO/DNSDHCP.html
-share/swat/help/Samba3-HOWTO/FastStart.html
-share/swat/help/Samba3-HOWTO/InterdomainTrusts.html
-share/swat/help/Samba3-HOWTO/IntroSMB.html
-share/swat/help/Samba3-HOWTO/NT4Migration.html
-share/swat/help/Samba3-HOWTO/NetCommand.html
-share/swat/help/Samba3-HOWTO/NetworkBrowsing.html
-share/swat/help/Samba3-HOWTO/Other-Clients.html
-share/swat/help/Samba3-HOWTO/PolicyMgmt.html
-share/swat/help/Samba3-HOWTO/Portability.html
-share/swat/help/Samba3-HOWTO/ProfileMgmt.html
-share/swat/help/Samba3-HOWTO/SWAT.html
-share/swat/help/Samba3-HOWTO/SambaHA.html
-share/swat/help/Samba3-HOWTO/ServerType.html
-share/swat/help/Samba3-HOWTO/StandAloneServer.html
-share/swat/help/Samba3-HOWTO/TOSHpreface.html
-share/swat/help/Samba3-HOWTO/VFS.html
-share/swat/help/Samba3-HOWTO/apa.html
-share/swat/help/Samba3-HOWTO/bugreport.html
-share/swat/help/Samba3-HOWTO/cfgsmarts.html
-share/swat/help/Samba3-HOWTO/ch-ldap-tls.html
-share/swat/help/Samba3-HOWTO/ch47.html
-share/swat/help/Samba3-HOWTO/classicalprinting.html
-share/swat/help/Samba3-HOWTO/compiling.html
-share/swat/help/Samba3-HOWTO/diagnosis.html
-share/swat/help/Samba3-HOWTO/domain-member.html
-share/swat/help/Samba3-HOWTO/go01.html
-share/swat/help/Samba3-HOWTO/groupmapping.html
-share/swat/help/Samba3-HOWTO/idmapper.html
-share/swat/help/Samba3-HOWTO/images/10small.png
-share/swat/help/Samba3-HOWTO/images/11small.png
-share/swat/help/Samba3-HOWTO/images/12small.png
-share/swat/help/Samba3-HOWTO/images/13small.png
-share/swat/help/Samba3-HOWTO/images/14small.png
-share/swat/help/Samba3-HOWTO/images/1small.png
-share/swat/help/Samba3-HOWTO/images/2small.png
-share/swat/help/Samba3-HOWTO/images/3small.png
-share/swat/help/Samba3-HOWTO/images/4small.png
-share/swat/help/Samba3-HOWTO/images/5small.png
-share/swat/help/Samba3-HOWTO/images/6small.png
-share/swat/help/Samba3-HOWTO/images/7small.png
-share/swat/help/Samba3-HOWTO/images/8small.png
-share/swat/help/Samba3-HOWTO/images/9small.png
-share/swat/help/Samba3-HOWTO/images/WME001.png
-share/swat/help/Samba3-HOWTO/images/WME002.png
-share/swat/help/Samba3-HOWTO/images/WME003.png
-share/swat/help/Samba3-HOWTO/images/WME004.png
-share/swat/help/Samba3-HOWTO/images/WME005.png
-share/swat/help/Samba3-HOWTO/images/WME006.png
-share/swat/help/Samba3-HOWTO/images/WME007.png
-share/swat/help/Samba3-HOWTO/images/WME008.png
-share/swat/help/Samba3-HOWTO/images/WME009.png
-share/swat/help/Samba3-HOWTO/images/WME010.png
-share/swat/help/Samba3-HOWTO/images/WME011.png
-share/swat/help/Samba3-HOWTO/images/WME012.png
-share/swat/help/Samba3-HOWTO/images/WME013.png
-share/swat/help/Samba3-HOWTO/images/WME014.png
-share/swat/help/Samba3-HOWTO/images/WXPP002.png
-share/swat/help/Samba3-HOWTO/images/WXPP003.png
-share/swat/help/Samba3-HOWTO/images/WXPP005.png
-share/swat/help/Samba3-HOWTO/images/WXPP009.png
-share/swat/help/Samba3-HOWTO/images/WXPP014.png
-share/swat/help/Samba3-HOWTO/images/a_small.png
-share/swat/help/Samba3-HOWTO/images/access1.png
-share/swat/help/Samba3-HOWTO/images/browsing1.png
-share/swat/help/Samba3-HOWTO/images/cups1.png
-share/swat/help/Samba3-HOWTO/images/cups2.png
-share/swat/help/Samba3-HOWTO/images/domain.png
-share/swat/help/Samba3-HOWTO/images/ethereal1.png
-share/swat/help/Samba3-HOWTO/images/ethereal2.png
-share/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
-share/swat/help/Samba3-HOWTO/images/idmap-groups.png
-share/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
-share/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
-share/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
-share/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
-share/swat/help/Samba3-HOWTO/images/idmap.png
-share/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
-share/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
-share/swat/help/Samba3-HOWTO/images/pdftosocket.png
-share/swat/help/Samba3-HOWTO/images/trusts1.png
-share/swat/help/Samba3-HOWTO/images/w2kp001.png
-share/swat/help/Samba3-HOWTO/images/w2kp002.png
-share/swat/help/Samba3-HOWTO/images/w2kp003.png
-share/swat/help/Samba3-HOWTO/images/w2kp004.png
-share/swat/help/Samba3-HOWTO/images/w2kp005.png
-share/swat/help/Samba3-HOWTO/images/w2kp006.png
-share/swat/help/Samba3-HOWTO/images/wxpp001.png
-share/swat/help/Samba3-HOWTO/images/wxpp004.png
-share/swat/help/Samba3-HOWTO/images/wxpp006.png
-share/swat/help/Samba3-HOWTO/images/wxpp007.png
-share/swat/help/Samba3-HOWTO/images/wxpp008.png
-share/swat/help/Samba3-HOWTO/images/wxpp010.png
-share/swat/help/Samba3-HOWTO/images/wxpp011.png
-share/swat/help/Samba3-HOWTO/images/wxpp012.png
-share/swat/help/Samba3-HOWTO/images/wxpp013.png
-share/swat/help/Samba3-HOWTO/images/wxpp015.png
-share/swat/help/Samba3-HOWTO/index.html
-share/swat/help/Samba3-HOWTO/install.html
-share/swat/help/Samba3-HOWTO/integrate-ms-networks.html
-share/swat/help/Samba3-HOWTO/introduction.html
-share/swat/help/Samba3-HOWTO/ix01.html
-share/swat/help/Samba3-HOWTO/largefile.html
-share/swat/help/Samba3-HOWTO/locking.html
-share/swat/help/Samba3-HOWTO/migration.html
-share/swat/help/Samba3-HOWTO/msdfs.html
-share/swat/help/Samba3-HOWTO/optional.html
-share/swat/help/Samba3-HOWTO/pam.html
-share/swat/help/Samba3-HOWTO/passdb.html
-share/swat/help/Samba3-HOWTO/pr01.html
-share/swat/help/Samba3-HOWTO/pr02.html
-share/swat/help/Samba3-HOWTO/pr03.html
-share/swat/help/Samba3-HOWTO/problems.html
-share/swat/help/Samba3-HOWTO/rights.html
-share/swat/help/Samba3-HOWTO/samba-bdc.html
-share/swat/help/Samba3-HOWTO/samba-pdc.html
-share/swat/help/Samba3-HOWTO/securing-samba.html
-share/swat/help/Samba3-HOWTO/speed.html
-share/swat/help/Samba3-HOWTO/tdb.html
-share/swat/help/Samba3-HOWTO/troubleshooting.html
-share/swat/help/Samba3-HOWTO/type.html
-share/swat/help/Samba3-HOWTO/unicode.html
-share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
-share/swat/help/Samba3-HOWTO/winbind.html
-share/swat/help/manpages/eventlogadm.8.html
-share/swat/help/manpages/findsmb.1.html
-share/swat/help/manpages/idmap_ad.8.html
-share/swat/help/manpages/idmap_adex.8.html
-share/swat/help/manpages/idmap_autorid.8.html
-share/swat/help/manpages/idmap_hash.8.html
-share/swat/help/manpages/idmap_ldap.8.html
-share/swat/help/manpages/idmap_nss.8.html
-share/swat/help/manpages/idmap_rid.8.html
-share/swat/help/manpages/idmap_tdb.8.html
-share/swat/help/manpages/idmap_tdb2.8.html
-share/swat/help/manpages/index.html
-share/swat/help/manpages/lmhosts.5.html
-share/swat/help/manpages/log2pcap.1.html
-share/swat/help/manpages/net.8.html
-share/swat/help/manpages/nmbd.8.html
-share/swat/help/manpages/nmblookup.1.html
-share/swat/help/manpages/ntlm_auth.1.html
-share/swat/help/manpages/pam_winbind.8.html
-share/swat/help/manpages/pam_winbind.conf.5.html
-share/swat/help/manpages/pdbedit.8.html
-share/swat/help/manpages/profiles.1.html
-share/swat/help/manpages/rpcclient.1.html
-share/swat/help/manpages/samba.7.html
-share/swat/help/manpages/sharesec.1.html
-share/swat/help/manpages/smb.conf.5.html
-share/swat/help/manpages/smbcacls.1.html
-share/swat/help/manpages/smbclient.1.html
-share/swat/help/manpages/smbcontrol.1.html
-share/swat/help/manpages/smbcquotas.1.html
-share/swat/help/manpages/smbd.8.html
-share/swat/help/manpages/smbget.1.html
-share/swat/help/manpages/smbgetrc.5.html
-share/swat/help/manpages/smbpasswd.5.html
-share/swat/help/manpages/smbpasswd.8.html
-share/swat/help/manpages/smbspool.8.html
-share/swat/help/manpages/smbstatus.1.html
-share/swat/help/manpages/smbta-util.8.html
-share/swat/help/manpages/smbtar.1.html
-share/swat/help/manpages/smbtree.1.html
-share/swat/help/manpages/swat.8.html
-share/swat/help/manpages/tdbbackup.8.html
-share/swat/help/manpages/tdbdump.8.html
-share/swat/help/manpages/tdbtool.8.html
-share/swat/help/manpages/testparm.1.html
-share/swat/help/manpages/vfs_acl_tdb.8.html
-share/swat/help/manpages/vfs_acl_xattr.8.html
-share/swat/help/manpages/vfs_aio_fork.8.html
-share/swat/help/manpages/vfs_aio_pthread.8.html
-share/swat/help/manpages/vfs_audit.8.html
-share/swat/help/manpages/vfs_cacheprime.8.html
-share/swat/help/manpages/vfs_cap.8.html
-share/swat/help/manpages/vfs_catia.8.html
-share/swat/help/manpages/vfs_commit.8.html
-share/swat/help/manpages/vfs_crossrename.8.html
-share/swat/help/manpages/vfs_default_quota.8.html
-share/swat/help/manpages/vfs_dirsort.8.html
-share/swat/help/manpages/vfs_extd_audit.8.html
-share/swat/help/manpages/vfs_fake_perms.8.html
-share/swat/help/manpages/vfs_fileid.8.html
-share/swat/help/manpages/vfs_full_audit.8.html
-share/swat/help/manpages/vfs_gpfs.8.html
-share/swat/help/manpages/vfs_netatalk.8.html
-share/swat/help/manpages/vfs_notify_fam.8.html
-share/swat/help/manpages/vfs_prealloc.8.html
-share/swat/help/manpages/vfs_preopen.8.html
-share/swat/help/manpages/vfs_readahead.8.html
-share/swat/help/manpages/vfs_readonly.8.html
-share/swat/help/manpages/vfs_recycle.8.html
-share/swat/help/manpages/vfs_scannedonly.8.html
-share/swat/help/manpages/vfs_shadow_copy.8.html
-share/swat/help/manpages/vfs_shadow_copy2.8.html
-share/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
-share/swat/help/manpages/vfs_streams_depot.8.html
-share/swat/help/manpages/vfs_streams_xattr.8.html
-share/swat/help/manpages/vfs_time_audit.8.html
-share/swat/help/manpages/vfs_xattr_tdb.8.html
-share/swat/help/manpages/vfstest.1.html
-share/swat/help/manpages/wbinfo.1.html
-share/swat/help/manpages/winbind_krb5_locator.7.html
-share/swat/help/manpages/winbindd.8.html
-share/swat/help/welcome-no-samba-doc.html
-share/swat/help/welcome.html
-share/swat/images/globals.gif
-share/swat/images/home.gif
-share/swat/images/passwd.gif
-share/swat/images/printers.gif
-share/swat/images/samba.gif
-share/swat/images/shares.gif
-share/swat/images/status.gif
-share/swat/images/viewconfig.gif
-share/swat/images/wizard.gif
-share/swat/include/footer.html
-share/swat/include/header.html
-share/swat/lang/ja/help/welcome.html
-share/swat/lang/tr/help/welcome.html
-share/swat/lang/tr/images/globals.gif
-share/swat/lang/tr/images/home.gif
-share/swat/lang/tr/images/passwd.gif
-share/swat/lang/tr/images/printers.gif
-share/swat/lang/tr/images/samba.gif
-share/swat/lang/tr/images/shares.gif
-share/swat/lang/tr/images/status.gif
-share/swat/lang/tr/images/viewconfig.gif
-@dir share/swat/lang/tr/js
-@dir share/swat/lang/tr/include
-@dir share/swat/lang/ja/js
-@dir share/swat/lang/ja/include
-@dir share/swat/lang/ja/images
-@dir share/swat/js
Index: net/samba42/Makefile
===================================================================
--- net/samba42/Makefile
+++ net/samba42/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}42
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -155,7 +155,6 @@
--with-winbind \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
Index: net/samba42/pkg-plist
===================================================================
--- net/samba42/pkg-plist
+++ net/samba42/pkg-plist
@@ -197,6 +197,8 @@
lib/libsamba-util.so.0
lib/libsamdb.so
lib/libsamdb.so.0
+lib/libsmbclient.so
+lib/libsmbclient.so.0
lib/libsmbclient-raw.so
lib/libsmbclient-raw.so.0
lib/libsmbconf.so
@@ -473,6 +475,7 @@
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/smbclient-raw.pc
%%PKGCONFIGDIR%%/torture.pc
%%PKGCONFIGDIR%%/wbclient.pc
Index: net/samba43/Makefile
===================================================================
--- net/samba43/Makefile
+++ net/samba43/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}43
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -155,7 +155,6 @@
--with-winbind \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
.if ${ARCH} == "amd64"
Index: net/samba43/pkg-plist
===================================================================
--- net/samba43/pkg-plist
+++ net/samba43/pkg-plist
@@ -204,6 +204,8 @@
lib/libsamba-util.so.0
lib/libsamdb.so
lib/libsamdb.so.0
+lib/libsmbclient.so
+lib/libsmbclient.so.0
lib/libsmbclient-raw.so
lib/libsmbclient-raw.so.0
lib/libsmbconf.so
@@ -496,6 +498,7 @@
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/smbclient-raw.pc
%%PKGCONFIGDIR%%/torture.pc
%%PKGCONFIGDIR%%/wbclient.pc
Index: net/samba44/Makefile
===================================================================
--- net/samba44/Makefile
+++ net/samba44/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}44
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -156,7 +156,6 @@
--disable-rpath \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
.if ${ARCH} == "amd64"
Index: net/samba44/pkg-plist
===================================================================
--- net/samba44/pkg-plist
+++ net/samba44/pkg-plist
@@ -160,6 +160,8 @@
lib/samba4/libsamba-util.so.0
lib/samba4/libsamdb.so
lib/samba4/libsamdb.so.0
+lib/samba4/libsmbclient.so
+lib/samba4/libsmbclient.so.0
lib/samba4/libsmbconf.so
lib/samba4/libsmbconf.so.0
%%LDAP%%lib/samba4/libsmbldap.so
@@ -448,6 +450,7 @@
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/wbclient.pc
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so
Index: net/smb4k-kde4/Makefile
===================================================================
--- net/smb4k-kde4/Makefile
+++ net/smb4k-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smb4k-kde4
PORTVERSION= 0.10.9
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net kde
MASTER_SITES= SF/smb4k
DISTNAME= smb4k-${PORTVERSION}
@@ -11,12 +11,9 @@
MAINTAINER= jpaetzel@FreeBSD.org
COMMENT= KDE 4.x SMB Network browser and SMB shares mounting center
-RUN_DEPENDS= sudo:security/sudo \
- smbstatus:${SAMBA_PORT}
+RUN_DEPENDS= sudo:security/sudo
-SAMBA_PORT?= net/samba36
-
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 samba:run tar:bzip2
USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde4
USE_KDE= kdelibs automoc4 runtime
USE_QT4= corelib gui network opengl script svg webkit \
Index: print/apsfilter/Makefile
===================================================================
--- print/apsfilter/Makefile
+++ print/apsfilter/Makefile
@@ -3,7 +3,7 @@
PORTNAME= apsfilter
PORTVERSION= 7.2.8
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= print
MASTER_SITES= http://www.apsfilter.org/download/
DIST_SUBDIR= apsfilter
@@ -51,6 +51,7 @@
PORTDOCS= ANNOUNCE FAQ HOWTO-BUGREPORTS apsfilter4.png \
README.BSD handbook.html README.TeX paper
GS_USES= ghostscript:run
+SAMBA_USES= samba:run
.include <bsd.port.options.mk>
@@ -108,7 +109,6 @@
_DEPENDS_HTML2PS= \
html2ps:print/html2ps
_DEPENDS_ATALK= pap:net/netatalk
-_DEPENDS_SAMBA= smbclient:net/samba36
_DEPENDS_MP3= mpg321:audio/mpg321
_DEPENDS_OGG= ogg123:audio/vorbis-tools
_DEPENDS_WAV= wavplay:audio/wavplay
Index: print/cups-smb-backend/Makefile
===================================================================
--- print/cups-smb-backend/Makefile
+++ print/cups-smb-backend/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cups-smb-backend
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
@@ -11,12 +11,11 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= CUPS backend for printing to Windows servers
-RUN_DEPENDS= smbspool:net/${SAMBA_PORT} \
- ${LOCALBASE}/sbin/cupsd:print/cups
+RUN_DEPENDS= ${LOCALBASE}/sbin/cupsd:print/cups
+USES= samba:run # smbspool
NO_BUILD= yes
PLIST_FILES= libexec/cups/backend/smb
-SAMBA_PORT?= samba36
SUB_FILES= pkg-message
do-install:
Index: print/gnome-cups-manager/Makefile
===================================================================
--- print/gnome-cups-manager/Makefile
+++ print/gnome-cups-manager/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-cups-manager
PORTVERSION= 0.31
-PORTREVISION= 16
+PORTREVISION= 17
PORTEPOCH= 1
CATEGORIES= print gnome
MASTER_SITES= GNOME
@@ -16,15 +16,15 @@
LIB_DEPENDS= libgnomecups-1.0.so:print/libgnomecups
RUN_DEPENDS= gnomesu:security/libgnomesu
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool pathfix pkgconfig samba:lib tar:bzip2
USE_GNOME= gnomeprefix intlhack libgnomeprintui libgnomeui
USE_LDCONFIG= yes
USE_XORG= x11
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES
-LIBS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${SAMBAINCLUDES} -D_IPP_PRIVATE_STRUCTURES
+LIBS+= -L${LOCALBASE}/lib -L${SAMBALIBS}
post-patch:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
Index: security/samba-virusfilter/Makefile
===================================================================
--- security/samba-virusfilter/Makefile
+++ security/samba-virusfilter/Makefile
@@ -9,21 +9,22 @@
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= On-access anti-virus filter for Samba
-PATCH_DEPENDS= smbclient:net/${SAMBA_PORT}
-BUILD_DEPENDS= ${NONEXISTENT}:net/${SAMBA_PORT}:configure
+BROKEN= fails to configure with samba 4
+
+PATCH_DEPENDS= smbclient:${SAMBAPORT}
+BUILD_DEPENDS= ${NONEXISTENT}:${SAMBAPORT}:configure
RUN_DEPENDS= ksh:shells/pdksh
GNU_CONFIGURE= yes
-USES= gmake shebangfix tar:bzip2
+USES= gmake samba:env shebangfix tar:bzip2
SHEBANG_FILES= bin/svf-notify.ksh
USE_GITHUB= yes
GH_ACCOUNT= fumiyas
ALL_TARGET= # should empty
-CONFIGURE_ARGS= --with-samba-source=`cd ${PORTSDIR}/net/${SAMBA_PORT}; ${MAKE} -VWRKSRC` \
+CONFIGURE_ARGS= --with-samba-source=`cd ${PORTSDIR}/${SAMBAPORT}; ${MAKE} -VWRKSRC` \
--with-clamd=${PREFIX}/sbin/clamd --with-savdid=${PREFIX}/bin/savdid
-SAMBA_PORT?= samba36
-USE_AUTOTOOLS= autoconf autoheader # for net/${SAMBA_PORT} configure
+USE_AUTOTOOLS= autoconf autoheader # for ${SAMBAPORT} configure
MAKE_ARGS= SAMBA_DATADIR=${PREFIX}
.include <bsd.port.mk>
Index: security/sssd/Makefile
===================================================================
--- security/sssd/Makefile
+++ security/sssd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sssd
PORTVERSION= 1.11.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= https://fedorahosted.org/released/${PORTNAME}/ \
http://mirrors.rit.edu/zi/
@@ -69,7 +69,7 @@
OPTIONS_SUB= yes
SMB_DESC= Install IPA and AD providers (requires Samba4)
-SMB_BUILD_DEPENDS= samba42>=4.2.11:net/samba42
+SMB_USES= samba:lib # libndr-krb5pac libndr-nbt libndr libsamba-util
SMB_CONFIGURE_WITH= samba
post-patch:
Index: security/sssd/files/patch-src__external__pac_responder.m4
===================================================================
--- security/sssd/files/patch-src__external__pac_responder.m4
+++ security/sssd/files/patch-src__external__pac_responder.m4
@@ -1,6 +1,6 @@
---- src/external/pac_responder.m4.orig 2014-09-17 15:01:37.000000000 +0200
-+++ src/external/pac_responder.m4 2015-11-26 10:14:25.245313290 +0100
-@@ -14,14 +14,16 @@
+--- src/external/pac_responder.m4.orig 2014-09-17 13:01:37 UTC
++++ src/external/pac_responder.m4
+@@ -14,14 +14,17 @@ then
PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes,
AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac]))
@@ -15,7 +15,8 @@
- Kerberos\ 5\ release\ 1.12*)
+ Kerberos\ 5\ release\ 1.12* | \
+ Kerberos\ 5\ release\ 1.13* | \
-+ Kerberos\ 5\ release\ 1.14*)
++ Kerberos\ 5\ release\ 1.14* | \
++ Kerberos\ 5\ release\ 1.15*)
krb5_version_ok=yes
AC_MSG_RESULT([yes])
;;
Index: sysutils/backuppc-devel/Makefile
===================================================================
--- sysutils/backuppc-devel/Makefile
+++ sysutils/backuppc-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= backuppc
DISTVERSION= 4.0.0alpha3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-beta/${DISTVERSION}
PKGNAMESUFFIX= -devel
@@ -58,15 +58,12 @@
.if ${PORT_OPTIONS:MRSYNC_BPC}
RUN_DEPENDS+= rsync-bpc>=3.0.9.3:net/rsync-bpc
.endif
-.if ${PORT_OPTIONS:MNMBLOOKUP}
-RUN_DEPENDS+= nmblookup:net/samba-nmblookup
+.if ${PORT_OPTIONS:MNMBLOOKUP} || ${PORT_OPTIONS:MSMBCLIENT}
+USES+= samba:run # nmblookup, smbclient
.endif
.if ${PORT_OPTIONS:MRRDTOOL}
RUN_DEPENDS+= rrdtool:databases/rrdtool
.endif
-.if ${PORT_OPTIONS:MSMBCLIENT}
-RUN_DEPENDS+= smbclient:net/samba-smbclient
-.endif
.if ${PORT_OPTIONS:MXML_RSS}
RUN_DEPENDS+= p5-XML-RSS>=0:textproc/p5-XML-RSS
.endif
Index: sysutils/backuppc/Makefile
===================================================================
--- sysutils/backuppc/Makefile
+++ sysutils/backuppc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= backuppc
PORTVERSION= 3.3.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF
DISTNAME= BackupPC-${PORTVERSION}
@@ -36,8 +37,8 @@
PORTDOCS= ChangeLog LICENSE README
-OPTIONS_DEFINE= ARCHIVE_ZIP COMPRESS_ZLIB DOCS FILE_RSYNCP NMBLOOKUP \
- SMBCLIENT XML_RSS
+OPTIONS_DEFINE= ARCHIVE_ZIP COMPRESS_ZLIB DOCS FILE_RSYNCP SMB \
+ XML_RSS
OPTIONS_RADIO= GRAPHS
OPTIONS_RADIO_GRAPHS= RRD_GRAPHS RRDTOOL
@@ -47,18 +48,16 @@
ARCHIVE_ZIP_DESC= Perl module for Zip archive files
COMPRESS_ZLIB_DESC= Perl5 interface to zlib compression library
FILE_RSYNCP_DESC= Perl Rsync client
-NMBLOOKUP_DESC= NetBIOS Name lookup tool
RRD_GRAPHS_DESC= Apply graphs patch (but not install RRDTool)
RRDTOOL_DESC= Use RRDTool to generate pool statistic graphs
-SMBCLIENT_DESC= Samba client
+SMB_DESC= NetBIOS Name lookup and Samba client
XML_RSS_DESC= Perl extension to manage RSS files
ARCHIVE_ZIP_RUN_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip
COMPRESS_ZLIB_RUN_DEPENDS= p5-IO-Compress>=0:archivers/p5-IO-Compress
FILE_RSYNCP_RUN_DEPENDS= p5-File-RsyncP>=0:net/p5-File-RsyncP
-NMBLOOKUP_RUN_DEPENDS= nmblookup:net/samba-nmblookup
RRDTOOL_RUN_DEPENDS= rrdtool:databases/rrdtool
-SMBCLIENT_RUN_DEPENDS= smbclient:net/samba-smbclient
+SMB_USES= samba:run # nmblookup, smbclient
XML_RSS_RUN_DEPENDS= p5-XML-RSS>=0:textproc/p5-XML-RSS
RRD_GRAPHS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-bin-BackupPC \
${FILESDIR}/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm
Index: sysutils/fusefs-smbnetfs/Makefile
===================================================================
--- sysutils/fusefs-smbnetfs/Makefile
+++ sysutils/fusefs-smbnetfs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= smbnetfs
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION}
PKGNAMEPREFIX= fusefs-
@@ -12,8 +13,6 @@
LICENSE= GPLv2
-LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
-
OPTIONS_DEFINE= DOCS GNOME_KEYRING
OPTIONS_DEFAULT=GNOME_KEYRING
@@ -23,7 +22,7 @@
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-USES= fuse iconv pkgconfig tar:bzip2
+USES= fuse iconv pkgconfig samba:lib tar:bzip2
USE_GNOME= glib20
GNU_CONFIGURE= yes
Index: sysutils/gnome-control-center/Makefile
===================================================================
--- sysutils/gnome-control-center/Makefile
+++ sysutils/gnome-control-center/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-control-center
PORTVERSION= 3.18.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -58,8 +58,8 @@
OPTIONS_DEFAULT_i386= CHEESE
OPTIONS_DEFINE_amd64= CHEESE
OPTIONS_DEFAULT_amd64= CHEESE
-CUPS_LIB_DEPENDS= libcups.so:print/cups \
- libsmbclient.so:net/samba-libsmbclient
+CUPS_LIB_DEPENDS= libcups.so:print/cups
+CUPS_USES= samba:lib
CUPS_CONFIGURE_ENABLE= cups
CHEESE_LIB_DEPENDS= libcheese.so:multimedia/cheese
CHEESE_CONFIGURE_WITH= cheese
Index: www/elinks/Makefile
===================================================================
--- www/elinks/Makefile
+++ www/elinks/Makefile
@@ -3,7 +3,7 @@
PORTNAME= elinks
DISTVERSION= 0.11.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= http://elinks.or.cz/download/
@@ -19,8 +19,6 @@
LIBS+= -lexecinfo
-SAMBA_PORT?= net/samba36
-
OPTIONS_DEFINE= 88COLORS 256COLORS SPIDERMONKEY XBELMARKS LOCAL_CGI \
FINGER GOPHER BITTORRENT NNTP FTP FSP SMB EXMODE \
HIGHLIGHT IDN NOROOT FASTMEM PERL \
@@ -64,8 +62,7 @@
EXMODE_CONFIGURE_ON= --enable-exmode
-SMB_RUN_DEPENDS= smbclient:${SAMBA_PORT}
-SMB_BUILD_DEPENDS= smbclient:${SAMBA_PORT}
+SMB_USES= samba # smbclient
SMB_CONFIGURE_ENABLE= smb
FSP_RUN_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib
Index: www/mod_ntlm2/Makefile
===================================================================
--- www/mod_ntlm2/Makefile
+++ www/mod_ntlm2/Makefile
@@ -12,11 +12,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= NTLM authentication module for the Apache2 webserver
-BUILD_DEPENDS= smbclient:${SAMBA_PORT}
-
-SAMBA_PORT?= net/samba36
-
-
+USES= samba:build
USE_APACHE= 22
MAKE_ENV= APXS=${APXS}
Index: www/smb_auth/Makefile
===================================================================
--- www/smb_auth/Makefile
+++ www/smb_auth/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smb_auth
PORTVERSION= 0.05
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= LOCAL/dinoex
@@ -11,11 +11,10 @@
COMMENT= Proxy authentication module against an SMB server
.if !defined(WITHOUT_REGISTER_SAMBA)
-RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:${SAMBA_PORT}
+USES= samba:run # smbclient
.endif
ALL_TARGET= smb_auth
-SAMBA_PORT?= net/samba36
OPTIONS_DEFINE= DOCS
Index: www/squid-devel/Makefile
===================================================================
--- www/squid-devel/Makefile
+++ www/squid-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= squid
PORTVERSION= 4.0.18
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
http://www2.us.squid-cache.org/Versions/v4/ \
@@ -69,7 +70,7 @@
AUTH_SASL_LDFLAGS= -L${LOCALBASE}/lib
AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
AUTH_SASL_VARS= BASIC_AUTH+=SASL
-AUTH_SMB_RUN_DEPENDS= smbclient:net/samba43
+AUTH_SMB_USES= samba:run
AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI
AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session
Index: www/squid/Makefile
===================================================================
--- www/squid/Makefile
+++ www/squid/Makefile
@@ -2,6 +2,7 @@
PORTNAME= squid
PORTVERSION= 3.5.24
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
@@ -46,9 +47,8 @@
OPTIONS_SUB= yes
OPTIONS_GROUP= AUTH
-OPTIONS_RADIO= SMB FW
-OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SQL
-OPTIONS_RADIO_SMB=AUTH_SMB3 AUTH_SMB4
+OPTIONS_RADIO= FW
+OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \
FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
@@ -72,12 +72,8 @@
AUTH_SASL_LDFLAGS= -L${LOCALBASE}/lib
AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
AUTH_SASL_VARS= BASIC_AUTH+=SASL
-AUTH_SMB3_RUN_DEPENDS= smbclient:net/samba36
-AUTH_SMB3_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
-AUTH_SMB3_PLIST_SUB= AUTH_SMB=""
-AUTH_SMB4_RUN_DEPENDS= smbclient:net/samba42
-AUTH_SMB4_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
-AUTH_SMB4_PLIST_SUB= AUTH_SMB=""
+AUTH_SMB_USES= samba:run
+AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI
AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session
CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests
@@ -155,8 +151,7 @@
AUTH_LDAP_DESC= Install LDAP authentication helpers
AUTH_NIS_DESC= Install NIS/YP authentication helpers
AUTH_SASL_DESC= Install SASL authentication helpers
-AUTH_SMB3_DESC= Install SMB3 auth. helpers (req. net/samba36)
-AUTH_SMB4_DESC= Install SMB4 auth. helpers (req. net/samba42)
+AUTH_SMB_DESC= Samba authentication helpers
AUTH_SQL_DESC= Install SQL based auth
CACHE_DIGESTS_DESC= Use cache digests
DEBUG_DESC= Build with extended debugging support
@@ -174,7 +169,6 @@
KQUEUE_DESC= Kqueue(2) support
LARGEFILE_DESC= Support large (>2GB) cache and log files
NETTLE_DESC= Nettle MD5 algorithm support
-SMB_DESC= Samba authentication helpers
SNMP_DESC= SNMP support
SSL_CRTD_DESC= Use ssl_crtd to handle SSL cert requests
SSL_DESC= SSL gatewaying support
@@ -237,10 +231,6 @@
BASIC_AUTH+= DB SMB_LM MSNT-multi-domain NCSA PAM POP3 RADIUS fake getpwnam
EXTERNAL_ACL+= file_userip time_quota unix_group
-.if !defined(AUTH_SMB)
-PLIST_SUB+= AUTH_SMB="@comment "
-.endif
-
# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
BASIC_AUTH+= NIS
Index: x11-fm/doublecmd/Makefile
===================================================================
--- x11-fm/doublecmd/Makefile
+++ x11-fm/doublecmd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= doublecmd
PORTVERSION= 0.7.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fm
MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -107,7 +107,7 @@
QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
WCX_UNRAR_LIB_DEPENDS= libunrar.so.5:archivers/libunrar5
-WFX_SAMBA_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+WFX_SAMBA_USES= samba:lib
WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer
.include <bsd.port.options.mk>
Index: x11-fm/wcmcommander/Makefile
===================================================================
--- x11-fm/wcmcommander/Makefile
+++ x11-fm/wcmcommander/Makefile
@@ -4,7 +4,7 @@
PORTNAME= wcmcommander
PORTVERSION= 0.20.0
DISTVERSIONPREFIX= release-
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm
MAINTAINER= amdmi3@FreeBSD.org
@@ -28,8 +28,9 @@
FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
FREETYPE_CMAKE_BOOL= WITH_FREETYPE
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SMB_CMAKE_BOOL= WITH_SMBCLIENT
+SMB_CMAKE_ON= -DSMBCLIENT_LIBRARY=${SAMBALIBS}/libsmbclient.so -DSMBCLIENT_INCLUDE_DIR=${SAMBAINCLUDES}
SSH_LIB_DEPENDS= libssh2.so:security/libssh2
SSH_CMAKE_BOOL= WITH_LIBSSH2
Index: x11/kde4-runtime/Makefile
===================================================================
--- x11/kde4-runtime/Makefile
+++ x11/kde4-runtime/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 kde kde-kde4
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +12,6 @@
libexiv2.so:graphics/exiv2 \
libwebp.so:graphics/webp \
libslp.so:net/openslp \
- libsmbclient.so:net/samba-libsmbclient \
libssh.so:security/libssh \
libqzeitgeist.so:sysutils/qzeitgeist
# Explicitly depend on libssh to avoid interference with ssh.4 from
@@ -20,7 +19,7 @@
BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh
RUN_DEPENDS= cagibid:net/cagibi
-USES= cmake:outsource gettext gmake jpeg kde:4 shared-mime-info \
+USES= cmake:outsource gettext gmake jpeg kde:4 samba:lib shared-mime-info \
shebangfix tar:xz
USE_KDE= kactivities kdelibs oxygen-icons4 \
attica automoc4 pimlibs strigi nepomuk-core

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 8:39 PM (8 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31113959
Default Alt Text
D8919.diff (157 KB)

Event Timeline