Date: Fri, 12 Dec 2008 11:18:04 +0100 (CET) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/129591: [UPDATE] net/samba32-devel to 3.2.6 Message-ID: <20081212101804.BB6F54AE66@mail.vx.sk> Resent-Message-ID: <200812121020.mBCAK1jZ058425@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129591
>Category: ports
>Synopsis: [UPDATE] net/samba32-devel to 3.2.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 12 10:20:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 7.1-PRERELEASE i386/amd64
>Organization:
>Environment:
FreeBSD 7.1-PRERELEASE i386/amd64
>Description:
- Upgrade net/samba32-devel to 3.2.6
- Security patch for 3.2.4 is already included in source
- libexecinfo patch for configure.in is already in source
>How-To-Repeat:
>Fix:
Index: ports/net/samba32-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/samba32-devel/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ports/net/samba32-devel/Makefile 29 Nov 2008 18:23:52 -0000 1.2
+++ ports/net/samba32-devel/Makefile 12 Dec 2008 10:15:22 -0000
@@ -6,17 +6,12 @@
#
PORTNAME= samba
-PORTVERSION?= 3.2.4
-PORTREVISION= 1
+PORTVERSION?= 3.2.6
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= . old-versions rc pre
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
-PATCH_SITES= http://us1.samba.org/samba/ftp/patches/security/
-PATCHFILES= samba-3.2.4-CVE-2008-4314.patch
-PATCH_DIST_STRIP= -p2
-
MAINTAINER?= timur@FreeBSD.org
COMMENT?= A free SMB and CIFS client and server for UNIX
Index: ports/net/samba32-devel/distinfo
===================================================================
RCS file: /home/pcvs/ports/net/samba32-devel/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- ports/net/samba32-devel/distinfo 29 Nov 2008 18:23:52 -0000 1.2
+++ ports/net/samba32-devel/distinfo 12 Dec 2008 10:15:22 -0000
@@ -1,6 +1,3 @@
-MD5 (samba-3.2.4.tar.gz) = 7870a6bb3a025c6081cd56688acd494a
-SHA256 (samba-3.2.4.tar.gz) = a85ea5eee24453dbc227835124166f9fca769bc067b77fda048343572fbf3eeb
-SIZE (samba-3.2.4.tar.gz) = 25160752
-MD5 (samba-3.2.4-CVE-2008-4314.patch) = dc60e0f9d8c3d2447e25240dfb8a5db0
-SHA256 (samba-3.2.4-CVE-2008-4314.patch) = 66b0c6b9c493bc70f6ea7df55bda8d1ffdd4baf844ef3240a2d6b35d1a78ac38
-SIZE (samba-3.2.4-CVE-2008-4314.patch) = 1846
+MD5 (samba-3.2.6.tar.gz) = 0cd27c7afbb8211616eea4010f32271c
+SHA256 (samba-3.2.6.tar.gz) = f01ef08d5126707bd19b62bb0b6c6c50923f8a2bf848b7593af3214e1c75aee3
+SIZE (samba-3.2.6.tar.gz) = 25183301
Index: ports/net/samba32-devel/files/patch-configure.in
===================================================================
RCS file: /home/pcvs/ports/net/samba32-devel/files/patch-configure.in,v
retrieving revision 1.1
diff -u -r1.1 patch-configure.in
--- ports/net/samba32-devel/files/patch-configure.in 12 Oct 2008 01:37:46 -0000 1.1
+++ ports/net/samba32-devel/files/patch-configure.in 12 Dec 2008 10:15:22 -0000
@@ -1,5 +1,5 @@
---- ./configure.in.orig 2008-09-18 06:49:02.000000000 +0000
-+++ ./configure.in 2008-10-10 00:42:10.000000000 +0000
+--- configure.in.orig 2008-12-10 12:12:23.000000000 +0100
++++ configure.in 2008-12-12 00:45:32.135798535 +0100
@@ -184,16 +184,6 @@
fi
fi
@@ -17,7 +17,7 @@
#################################################
# check for a shared memory profiling support
AC_MSG_CHECKING(whether to use profiling)
-@@ -873,6 +863,21 @@
+@@ -888,6 +878,21 @@
[#include <signal.h>])
fi
@@ -39,15 +39,7 @@
AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
AC_TRY_COMPILE([
#include <sys/types.h>
-@@ -1038,6 +1043,7 @@
-
- # Find a method of generating a stack trace
- AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
-+AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
- AC_CHECK_FUNCS(backtrace_symbols)
- AC_CHECK_LIB(exc, trace_back_stack)
-
-@@ -1841,9 +1847,6 @@
+@@ -1858,9 +1863,6 @@
AC_MSG_CHECKING([PICFLAG])
AC_MSG_RESULT([$PICFLAG])
@@ -57,7 +49,7 @@
AC_CACHE_CHECK([whether building shared libraries actually works],
[ac_cv_shlib_works],[
# try building a trivial shared library
-@@ -2282,31 +2285,15 @@
+@@ -2299,31 +2301,15 @@
# This is here to handle -withval stuff for --with-libiconv
# Perhaps we should always add a -L
@@ -95,7 +87,7 @@
iconv_current_CPPFLAGS="-I$i/include"
if test x"$jm_cv_lib_iconv" != x; then
-@@ -2315,7 +2302,6 @@
+@@ -2332,7 +2318,6 @@
# We found iconv in libc.
iconv_current_LIBS=""
fi
@@ -103,7 +95,7 @@
fi
if test x"$ICONV_FOUND" = "xyes" ; then
-@@ -4013,10 +3999,10 @@
+@@ -4030,10 +4015,10 @@
################################################################
# first test for Active Directory support being enabled
@@ -118,7 +110,7 @@
##################################################################
# then test for uuid.h (necessary to generate unique DNS keynames
# (uuid.h is required for this test)
-@@ -5640,6 +5626,7 @@
+@@ -5673,6 +5658,7 @@
NSSSONAMEVERSIONSUFFIX=".1"
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
nsswitch/winbind_nss_linux.o"
@@ -126,7 +118,7 @@
WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
;;
-@@ -5718,23 +5705,15 @@
+@@ -5751,23 +5737,15 @@
fi
# Display test results
@@ -150,7 +142,7 @@
## Only worry about libwbclient if we have shared library support
## and winbindd
LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
-@@ -5752,26 +5731,34 @@
+@@ -5785,26 +5763,34 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
@@ -189,7 +181,7 @@
AC_SUBST(WINBIND_KRB5_LOCATOR)
-@@ -5866,7 +5853,7 @@
+@@ -5899,7 +5885,7 @@
AC_CHECK_FUNCS(DNSServiceRegister)
AC_CHECK_LIB_EXT(dns_sd, DNSSD_LIBS, DNSServiceRegister)
if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
@@ -198,7 +190,7 @@
have_dnssd_support=no
fi
-@@ -5922,13 +5909,21 @@
+@@ -5955,13 +5941,21 @@
# Start
AC_CHECK_FUNC(getmntent)
@@ -221,7 +213,7 @@
int main(void)
{
struct statfs fsd;
-@@ -6173,6 +6168,16 @@
+@@ -6207,6 +6201,16 @@
fi
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081212101804.BB6F54AE66>