Here is an update to samba 3.6.9.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/samba/Makefile,v
retrieving revision 1.171
diff -u -p -r1.171 Makefile
--- Makefile 25 Sep 2012 20:11:11 -0000 1.171
+++ Makefile 30 Oct 2012 07:22:26 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY= Yes
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= additional documentation and examples for Samba
-DISTNAME= samba-3.6.8
+DISTNAME= samba-3.6.9
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
FULLPKGPATH-docs= net/samba,-docs
@@ -27,8 +27,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += asn1 c crypto cups execinfo gssapi krb5 m ncurses popt
-WANTLIB += pthread readline ssl talloc tdb z
+WANTLIB += asn1 c crypto cups execinfo gssapi iniparser krb5 m ncurses
+WANTLIB += popt pthread readline ssl talloc tdb z
MASTER_SITES= http://download.samba.org/samba/ftp/ \
http://us2.samba.org/samba/ftp/ \
@@ -39,9 +39,10 @@ MODULES= converters/libiconv
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
sysutils/e2fsprogs
LIB_DEPENDS= databases/tdb>=1.2.7 \
- devel/popt \
+ devel/iniparser \
devel/libexecinfo \
devel/libtalloc \
+ devel/popt \
print/cups,-libs
MAKE_FLAGS+= PASSWD_PROGRAM="/usr/bin/passwd" \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/samba/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo 25 Sep 2012 20:11:11 -0000 1.34
+++ distinfo 30 Oct 2012 06:47:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.8.tar.gz) = T1oXGo2QLGtPgi7YdcUeuDORltnM8OzX9lIclms1FN4=
-SIZE (samba-3.6.8.tar.gz) = 34070798
+SHA256 (samba-3.6.9.tar.gz) = lxS1DBu9sNNSG9v0A7sRK1QFBAaFywtP8/mjcNHoQCA=
+SIZE (samba-3.6.9.tar.gz) = 34077002
Index: patches/patch-source3_configure_in
===================================================================
RCS file: /home/cvs/ports/net/samba/patches/patch-source3_configure_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-source3_configure_in
--- patches/patch-source3_configure_in 25 Sep 2012 20:11:11 -0000 1.5
+++ patches/patch-source3_configure_in 30 Oct 2012 06:50:39 -0000
@@ -1,47 +1,7 @@
$OpenBSD: patch-source3_configure_in,v 1.5 2012/09/25 20:11:11 brad Exp $
---- source3/configure.in.orig Fri Sep 14 04:12:09 2012
-+++ source3/configure.in Tue Sep 18 21:51:47 2012
-@@ -869,9 +869,15 @@ if test x$enable_cups != xno; then
-
- if test "x$CUPS_CONFIG" != x; then
-
-+ CUPS_CFLAGS="`$CUPS_CONFIG --cflags`"
-+ CUPS_LDFLAGS="`$CUPS_CONFIG --ldflags`"
-+ CUPS_LIBS="`$CUPS_CONFIG --libs`"
-+ ac_save_CPPFLAGS=$CPPFLAGS
- ac_save_LDFLAGS=$LDFLAGS
- ac_save_PRINT_LIBS=$PRINT_LIBS
-+ CPPFLAGS="$CUPS_CFLAGS"
- AC_CHECK_HEADERS(cups/cups.h cups/language.h)
-+ CPPFLAGS=$ac_save_CPPFLAGS
-
- if test x"$ac_cv_header_cups_cups_h" = xyes -a \
- x"$ac_cv_header_cups_language_h" = xyes; then
-@@ -879,18 +885,19 @@ if test x$enable_cups != xno; then
- # underlinked. With cups-config --libs we pull in
unwanted and unneeded
- # dendencies including thread libraries - use
cups-config only if really
- # required.
-+ LDFLAGS="$CUPS_LDFLAGS"
- AC_CHECK_LIB_EXT(cups, ac_save_PRINT_LIBS , httpConnect,
-- [PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"],
-+ [PRINT_LIBS="$CUPS_LDFLAGS -lcups
$ac_save_PRINT_LIBS"],
- [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`"])
-+ PRINT_LIBS="$CUPS_LDFLAGS $CUPS_LIBS"])
-
- AC_DEFINE(HAVE_CUPS,1,[Whether we have CUPS])
- samba_cv_HAVE_CUPS=yes
-+ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} $CUPS_CFLAGS"
- AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)
-+ LDFLAGS=$ac_save_LDFLAGS
- 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
-
-@@ -1675,8 +1682,7 @@ DSO_EXPORTS=""
+--- source3/configure.in.orig Mon Oct 29 05:05:46 2012
++++ source3/configure.in Tue Oct 30 02:50:04 2012
+@@ -1675,8 +1675,7 @@ DSO_EXPORTS=""
;;
*openbsd*) BLDSHARED="true"
LDSHFLAGS="-shared"
@@ -51,7 +11,7 @@ $OpenBSD: patch-source3_configure_in,v 1
PICFLAG="-fPIC"
AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work
correctly])
-@@ -6784,13 +6790,43 @@ fi
+@@ -6789,13 +6788,43 @@ fi
CFLAGS=$CFLAGS_SAVE
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
