pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/samba Update "samba" package to version 3.0.35. Ch...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4849a4b86d78
branches:  trunk
changeset: 395561:4849a4b86d78
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jul 08 19:37:27 2009 +0000

description:
Update "samba" package to version 3.0.35. Changes since version 3.0.34:
- CVE-2009-1888:
  In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a
  data value can potentially affect access control when "dos filemode"
  is set to "yes".

This security fix has already been integrated into "pkggsrc" via a patch
previously. The package was only updated to make future maintenance easier.

diffstat:

 net/samba/Makefile         |    8 +-
 net/samba/distinfo         |   13 +--
 net/samba/patches/patch-at |  152 +++++++++++++++++++-------------------------
 net/samba/patches/patch-bu |   18 ++--
 net/samba/patches/patch-db |   13 ---
 5 files changed, 84 insertions(+), 120 deletions(-)

diffs (truncated from 418 to 300 lines):

diff -r f147730eb7f1 -r 4849a4b86d78 net/samba/Makefile
--- a/net/samba/Makefile        Wed Jul 08 18:09:25 2009 +0000
+++ b/net/samba/Makefile        Wed Jul 08 19:37:27 2009 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.191 2009/06/23 20:36:27 drochner Exp $
+# $NetBSD: Makefile,v 1.192 2009/07/08 19:37:27 tron Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=              samba-${VERSION}
-PKGREVISION=           2
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
 
 .include "Makefile.patches"
 
-MAINTAINER=            jlam%pkgsrc.org@localhost
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.samba.org/
 COMMENT=               SMB/CIFS protocol server suite
+LICENSE=               gnu-gpl-v2
 
-VERSION=               3.0.34
+VERSION=               3.0.35
 CONFLICTS+=            ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]*   \
                        winbind-[0-9]*
 MAKE_JOBS_SAFE=                NO
diff -r f147730eb7f1 -r 4849a4b86d78 net/samba/distinfo
--- a/net/samba/distinfo        Wed Jul 08 18:09:25 2009 +0000
+++ b/net/samba/distinfo        Wed Jul 08 19:37:27 2009 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.68 2009/06/23 20:36:27 drochner Exp $
+$NetBSD: distinfo,v 1.69 2009/07/08 19:37:27 tron Exp $
 
-SHA1 (samba-3.0.34.tar.gz) = 18104d1bf509cd3fd3107c09fa6205666e04ac16
-RMD160 (samba-3.0.34.tar.gz) = d79cd544b5ab2b4a7130b8c52c19edcfc89083ea
-Size (samba-3.0.34.tar.gz) = 24835363 bytes
+SHA1 (samba-3.0.35.tar.gz) = c75e20890f893decfd4285480041b7e39d43ed3d
+RMD160 (samba-3.0.35.tar.gz) = 81c708aa6ab048f9fa24999650992a92a95f7da3
+Size (samba-3.0.35.tar.gz) = 24839204 bytes
 SHA1 (patch-aa) = b323c778c0c4f01cd102d019a996914d0d7eb106
 SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
 SHA1 (patch-ae) = 28fc3d1ad158f8025f1f9ba8e170d93c31fa45ba
 SHA1 (patch-af) = 9f14842b7d0b5e66bf1d52bcacefe5e1aa392b7c
 SHA1 (patch-ag) = c73e717e053b6618b2a334602fefabe5a5f98a98
 SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
-SHA1 (patch-at) = 708177043510be725b81ed66ac2f02518a560802
+SHA1 (patch-at) = d8f7ce814a2ce460d419ce6abf047505f170f3f2
 SHA1 (patch-au) = a3990e7da879e35bc184704547c08311bd8fa05e
 SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506
 SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538
@@ -29,7 +29,7 @@
 SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b
 SHA1 (patch-br) = fc0d4c1f638a534f86e59ed8ebaddbf1978fa64f
 SHA1 (patch-bs) = 1c08caf388e337497464097a11c909ddd5f9a3ff
-SHA1 (patch-bu) = 72c0c5bb830d9f0d231502e622215ba59255914f
+SHA1 (patch-bu) = b5f5dd7b2f4d8d246acc32a71556e0ff2f005b68
 SHA1 (patch-bv) = 2d80f4e24edab32bf4f620f651e70b9e63d28cc5
 SHA1 (patch-bw) = 11f9b3713382a23075ed5980d7b8a2dbd11ecf54
 SHA1 (patch-ca) = 0c2c4c1bdb3348de3e8719cc468a6e0c28a36b73
@@ -38,4 +38,3 @@
 SHA1 (patch-cg) = 2755a019759826a39c3e201f6a0d1646e6dd2fba
 SHA1 (patch-ch) = 3c4c404519154e294cee134ddb4d2b9c7d8e02a2
 SHA1 (patch-da) = 2dddd250b2207d658b02ff43b46199ce4305b7f8
-SHA1 (patch-db) = 2c8d11db6761ef0a9074bd16971eedf1820c8168
diff -r f147730eb7f1 -r 4849a4b86d78 net/samba/patches/patch-at
--- a/net/samba/patches/patch-at        Wed Jul 08 18:09:25 2009 +0000
+++ b/net/samba/patches/patch-at        Wed Jul 08 19:37:27 2009 +0000
@@ -1,16 +1,24 @@
-$NetBSD: patch-at,v 1.12 2009/03/21 18:25:34 tron Exp $
+$NetBSD: patch-at,v 1.13 2009/07/08 19:37:27 tron Exp $
 
---- configure.orig     2009-01-19 11:00:12.000000000 +0000
-+++ configure  2009-03-21 14:45:27.000000000 +0000
-@@ -667,6 +667,7 @@
- target_os
+--- configure.orig     2009-06-22 22:02:40.000000000 +0100
++++ configure  2009-07-08 15:21:45.000000000 +0100
+@@ -765,6 +765,7 @@
+ privatedir
+ logfilebase
+ piddir
++statedir
+ lockdir
  configdir
- lockdir
-+statedir
- piddir
- logfilebase
- privatedir
-@@ -1399,6 +1400,7 @@
+ target_os
+@@ -827,6 +828,7 @@
+ with_privatedir
+ with_rootsbindir
+ with_lockdir
++with_statedir
+ with_piddir
+ with_swatdir
+ with_configdir
+@@ -1537,6 +1539,7 @@
    --with-privatedir=DIR   Where to put smbpasswd ($ac_default_prefix/private)
    --with-rootsbindir=DIR  Which directory to use for root sbin ($ac_default_prefix/sbin)
    --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)
@@ -18,7 +26,7 @@
    --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)
    --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)
    --with-configdir=DIR    Where to put configuration files ($libdir)
-@@ -2141,6 +2143,7 @@
+@@ -2296,6 +2299,7 @@
  
  rootsbindir="\${SBINDIR}"
  lockdir="\${VARDIR}/locks"
@@ -26,7 +34,7 @@
  piddir="\${VARDIR}/locks"
  test "${mandir}" || mandir="\${prefix}/man"
  logfilebase="\${VARDIR}"
-@@ -2155,7 +2158,8 @@
+@@ -2310,7 +2314,8 @@
  if test "${with_fhs+set}" = set; then
    withval=$with_fhs;  case "$withval" in
    yes)
@@ -36,7 +44,7 @@
      piddir="\${VARDIR}/run"
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
-@@ -2229,6 +2233,26 @@
+@@ -2384,6 +2389,26 @@
  
  
  #################################################
@@ -49,8 +57,8 @@
 +  #
 +  # Just in case anybody calls it without argument
 +  #
-+    { echo "$as_me:$LINENO: WARNING: --with-statedir called without argument - will use default" >&5
-+echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: --with-statedir called without argument - will use default" >&5
++$as_echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;}
 +  ;;
 +  * )
 +    statedir="$withval"
@@ -63,7 +71,7 @@
  # set pid directory location
  
  # Check whether --with-piddir was given.
-@@ -2469,6 +2493,7 @@
+@@ -2624,6 +2649,7 @@
  
  
  
@@ -71,7 +79,7 @@
  ## check for --enable-debug first before checking CFLAGS before
  ## so that we don't mix -O and -g
  # Check whether --enable-debug was given.
-@@ -31354,7 +31379,8 @@
+@@ -33459,7 +33485,8 @@
  
  
  
@@ -79,16 +87,16 @@
 +
 +for ac_func in getdents getdents64 getpwent_r
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -46820,6 +46846,74 @@
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -49772,6 +49799,77 @@
  ##################
  # look for a method of finding the list of network interfaces
  iface=no;
-+{ echo "$as_me:$LINENO: checking for iface ifaddrs" >&5
-+echo $ECHO_N "checking for iface ifaddrs... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for iface ifaddrs" >&5
++$as_echo_n "checking for iface ifaddrs... " >&6; }
 +if test "${samba_cv_HAVE_IFACE_IFADDRS+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +
 +SAVE_CPPFLAGS="$CPPFLAGS"
@@ -113,36 +121,39 @@
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_try") 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  samba_cv_HAVE_IFACE_IFADDRS=yes
 +else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +( exit $ac_status )
 +samba_cv_HAVE_IFACE_IFADDRS=no
 +fi
++rm -rf conftest.dSYM
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +fi
 +
 +
 +fi
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_IFACE_IFADDRS" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_IFACE_IFADDRS" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_IFACE_IFADDRS" >&5
++$as_echo "$samba_cv_HAVE_IFACE_IFADDRS" >&6; }
 +CPPFLAGS="$SAVE_CPPFLAGS"
 +if test x"$samba_cv_HAVE_IFACE_IFADDRS" = x"yes"; then
 +      iface=yes;
@@ -153,31 +164,31 @@
 +fi
 +
 +if test $iface = no; then
- { echo "$as_me:$LINENO: checking for iface AIX" >&5
- echo $ECHO_N "checking for iface AIX... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for iface AIX" >&5
+ $as_echo_n "checking for iface AIX... " >&6; }
  if test "${samba_cv_HAVE_IFACE_AIX+set}" = set; then
-@@ -46887,6 +46981,7 @@
+@@ -49842,6 +49940,7 @@
  _ACEOF
  
  fi
 +fi
  
  if test $iface = no; then
- { echo "$as_me:$LINENO: checking for iface ifconf" >&5
-@@ -50266,9 +50361,9 @@
+ { $as_echo "$as_me:$LINENO: checking for iface ifconf" >&5
+@@ -53369,9 +53468,9 @@
  
  
  
--        { echo "$as_me:$LINENO: checking for des_set_key in -lcrypto" >&5
--echo $ECHO_N "checking for des_set_key in -lcrypto... $ECHO_C" >&6; }
+-        { $as_echo "$as_me:$LINENO: checking for des_set_key in -lcrypto" >&5
+-$as_echo_n "checking for des_set_key in -lcrypto... " >&6; }
 -if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then
-+        { echo "$as_me:$LINENO: checking for EVP_des_cbc in -lcrypto" >&5
-+echo $ECHO_N "checking for EVP_des_cbc in -lcrypto... $ECHO_C" >&6; }
++        { $as_echo "$as_me:$LINENO: checking for EVP_des_cbc in -lcrypto" >&5
++$as_echo_n "checking for EVP_des_cbc in -lcrypto... " >&6; }
 +if test "${ac_cv_lib_ext_crypto_EVP_des_cbc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -50284,11 +50379,11 @@
+@@ -53387,11 +53486,11 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -191,15 +202,15 @@
    ;
    return 0;
  }
-@@ -50311,13 +50406,13 @@
-        test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+@@ -53417,13 +53516,13 @@
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+        }; then
 -  ac_cv_lib_ext_crypto_des_set_key=yes;
 +  ac_cv_lib_ext_crypto_EVP_des_cbc=yes;
                  ac_cv_lib_ext_crypto=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -      ac_cv_lib_ext_crypto_des_set_key=no;
@@ -207,15 +218,15 @@
                  ac_cv_lib_ext_crypto=no
  fi
  
-@@ -50325,11 +50420,11 @@



Home | Main Index | Thread Index | Old Index