[pkgsrc/trunk]: pkgsrc/net/ja-samba Update ja-samba pacakge to 2.2.11.1.0.

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/794ebf4f1273
branches:  trunk
changeset: 481395:794ebf4f1273
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Oct 03 16:16:39 2004 +0000

description:
Update ja-samba pacakge to 2.2.11.1.0.

- Update to samba-2.2.11-ja-1.0; essential changes are already applied
  to previous package.
- Apply changes between samba 2.2.10 and 2.2.11; fixed the security
  problem reported as CAN-2004-0815.

diffstat:

 net/ja-samba/Makefile         |   4 ++--
 net/ja-samba/Makefile.common  |   4 ++--
 net/ja-samba/distinfo         |   8 ++++----
 net/ja-samba/patches/patch-aw |  30 ------------------------------
 net/ja-samba/patches/patch-ax |  12 ++++++++++++
 5 files changed, 20 insertions(+), 38 deletions(-)

diffs (98 lines):

diff -r 1998785675a9 -r 794ebf4f1273 net/ja-samba/Makefile
--- a/net/ja-samba/Makefile     Sun Oct 03 16:07:17 2004 +0000
+++ b/net/ja-samba/Makefile     Sun Oct 03 16:16:39 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2004/10/03 00:17:53 tv Exp $
+# $NetBSD: Makefile,v 1.30 2004/10/03 16:16:39 taca Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               ja-samba-${SAMBA_BASE_VERS}.${SAMBA_JA_VERS}
-PKGREVISION=   1
+PKGREVISION=
 CATEGORIES=            net
 
 MAINTAINER=            tech-pkg-ja%jp.NetBSD.org@localhost
diff -r 1998785675a9 -r 794ebf4f1273 net/ja-samba/Makefile.common
--- a/net/ja-samba/Makefile.common      Sun Oct 03 16:07:17 2004 +0000
+++ b/net/ja-samba/Makefile.common      Sun Oct 03 16:16:39 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2004/08/17 17:32:44 taca Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/10/03 16:16:39 taca Exp $
 
 DISTNAME=              samba-${SAMBA_BASE_VERS}-ja-${SAMBA_JA_VERS}
-SAMBA_BASE_VERS=       2.2.10
+SAMBA_BASE_VERS=       2.2.11
 SAMBA_JA_VERS=         1.0
 WRKSRC?=               ${WRKDIR}/${DISTNAME}/source
 CATEGORIES?=           net
diff -r 1998785675a9 -r 794ebf4f1273 net/ja-samba/distinfo
--- a/net/ja-samba/distinfo     Sun Oct 03 16:07:17 2004 +0000
+++ b/net/ja-samba/distinfo     Sun Oct 03 16:16:39 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2004/08/17 17:32:44 taca Exp $
+$NetBSD: distinfo,v 1.16 2004/10/03 16:16:39 taca Exp $
 
-SHA1 (samba-2.2.10-ja-1.0.tar.bz2) = efe97e5bea7a824dfd76909ffe124f425862a7b4
-Size (samba-2.2.10-ja-1.0.tar.bz2) = 7473659 bytes
+SHA1 (samba-2.2.11-ja-1.0.tar.bz2) = 94944b5a81e37322c6f112474e7df14e4cde8e1a
+Size (samba-2.2.11-ja-1.0.tar.bz2) = 7473344 bytes
 SHA1 (patch-aa) = 2f553bd640a819e9543d4678c779d5f98a164e3f
 SHA1 (patch-ab) = a2eef891b0a38955f22a9adeec09666d231a541f
 SHA1 (patch-ac) = c1de3af21a4b539236a906c4c072e6db283a2b28
@@ -14,4 +14,4 @@
 SHA1 (patch-ao) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41
 SHA1 (patch-ap) = 5c5dea7e8b67885e8214210dfff344a9d6102279
 SHA1 (patch-aq) = 73017f99efd1b4e3d93d8f14e63f0c43e391236d
-SHA1 (patch-aw) = 996a1cf5756cd43865ae99ff76cd333b9038a98a
+SHA1 (patch-ax) = c794b68f644a70c95a8fac43a71b63c16e2f6acc
diff -r 1998785675a9 -r 794ebf4f1273 net/ja-samba/patches/patch-aw
--- a/net/ja-samba/patches/patch-aw     Sun Oct 03 16:07:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2004/08/17 17:32:44 taca Exp $
-
---- rpc_server/srv_spoolss_nt.c.orig   2003-07-17 20:34:06.000000000 +0900
-+++ rpc_server/srv_spoolss_nt.c
-@@ -2842,6 +2842,12 @@ static WERROR printserver_notify_info(pi
-       info->data=NULL;
-       info->count=0;
- 
-+      /* a bug in xp sp2 rc2 causes it to send a fnpcn request without 
-+         sending a ffpcn() request first */
-+
-+      if ( !option )
-+              return WERR_BADFID;
-+
-       for (i=0; i<option->count; i++) {
-               option_type = &(option->ctr.type[i]);
-               
-@@ -2903,6 +2909,12 @@ static WERROR printer_notify_info(pipes_
-       info->data=NULL;
-       info->count=0;
- 
-+      /* a bug in xp sp2 rc2 causes it to send a fnpcn request without 
-+         sending a ffpcn() request first */
-+
-+      if ( !option )
-+              return WERR_BADFID;
-+
-       get_printer_snum(p, hnd, &snum);
- 
-       for (i=0; i<option->count; i++) {
diff -r 1998785675a9 -r 794ebf4f1273 net/ja-samba/patches/patch-ax
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ja-samba/patches/patch-ax     Sun Oct 03 16:16:39 2004 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ax,v 1.1 2004/10/03 16:16:39 taca Exp $
+
+--- smbd/vfs.c.orig    2003-05-20 11:17:19.000000000 +0900
++++ smbd/vfs.c
+@@ -790,7 +790,6 @@ BOOL reduce_name(connection_struct *conn
+       *dir2 = *wd = *base_name = *newname = 0;
+ 
+       if (widelinks) {
+-              unix_clean_name(s);
+               /* can't have a leading .. */
+               if (strncmp(s,"..",2) == 0 && (s[2]==0 || s[2]=='/')) {
+                       DEBUG(3,("Illegal file name? (%s)\n",s));