Attachment #49172 for bug #75168

View | Details | Raw Unified | Return to bug 75168
Collapse All | Expand All




#

PORTNAME=		samba
PORTVERSION=		3.0.10
PORTREVISION?=		0
PORTEPOCH?=		1
CATEGORIES?=		net

SAMBA_RUNDIR=		${VARDIR}/run
SAMBA_LOCKDIR?=		${VARDIR}/db/samba
SAMBA_PRIVATE?=		${PREFIX}/private
SAMBA_CONFDIR?=		${PREFIX}/etc
SAMBA_SWATDIR=		${PREFIX}/share/swat
SAMBA_LIBDIR=		${PREFIX}/lib
RC_DIR=			${PREFIX}/etc/rc.d
SAMBA_CONFIG=		${SAMBA_CONFDIR}/smb.conf

CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \


PLIST_SUB+=		RC_DIR=${RC_DIR} \
			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
			SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
			SAMBA_CONFIG=${SAMBA_CONFIG}

RC_SCRIPTS_SUB=		PREFIX=${PREFIX} \
			CUPS=${CUPS} \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (samba-3.0.9.tar.gz) = 9cf2bcef71509a81687dec8732545400	1	MD5 (samba-3.0.10.tar.gz) = b19fd86d3c11a1b43f75a5988cd9ceeb
2	SIZE (samba-3.0.9.tar.gz) = 15172821	2	SIZE (samba-3.0.10.tar.gz) = 15176926

Lines 23-30 Link Here

(-)pkg-plist (-2 / +3 lines)
23	%%WINBIND%%bin/wbinfo	23	%%WINBIND%%bin/wbinfo
24	@unexec %D/etc/rc.d/samba.sh forcestop 2>/dev/null \|\| true	24	@unexec %D/etc/rc.d/samba.sh forcestop 2>/dev/null \|\| true
25	etc/rc.d/samba.sh	25	etc/rc.d/samba.sh
26	@unexec if cmp -s %D/etc/smb.conf %D/etc/smb.conf.default; then rm -f %D/etc/smb.conf; fi	26	@unexec if cmp -s %%SAMBA_CONFIG%% %%SAMBA_CONFIG%%.default; then rm -f %%SAMBA_CONFIG%%; fi
27	etc/smb.conf.default	27	@unexec rm -f %%SAMBA_CONFIG%%.default 2>/dev/null \|\| true
28	sbin/smbd	28	sbin/smbd
29	sbin/nmbd	29	sbin/nmbd
30	sbin/swat	30	sbin/swat
Lines 434-439 Link Here
434	share/swat/help/nmbd.8.html	434	share/swat/help/nmbd.8.html
435	share/swat/help/nmblookup.1.html	435	share/swat/help/nmblookup.1.html
436	share/swat/help/ntlm_auth.1.html	436	share/swat/help/ntlm_auth.1.html
		437	share/swat/help/pam_winbind.8.html
437	share/swat/help/pdbedit.8.html	438	share/swat/help/pdbedit.8.html
438	share/swat/help/profiles.1.html	439	share/swat/help/profiles.1.html
439	share/swat/help/rpcclient.1.html	440	share/swat/help/rpcclient.1.html




--- lib/util_str.c.orig	Thu Dec 16 20:46:53 2004
+++ lib/util_str.c	Thu Dec 16 20:48:54 2004
@@ -2008,10 +2008,16 @@
 {
 	int bits = 0;
 	int char_count = 0;
-	size_t out_cnt = 0;
-	size_t len = data.length;
-	size_t output_len = data.length * 2;
-	char *result = SMB_MALLOC(output_len); /* get us plenty of space */
+	size_t out_cnt, len, output_len;
+	char *result;
+
+	 if (!data.length || !data.data)
+		return NULL;
+
+	out_cnt = 0;
+	len = data.length;
+	output_len = data.length * 2;
+	result = SMB_MALLOC(output_len); /* get us plenty of space */
 
 	while (len-- && out_cnt < (data.length * 2) - 5) {
 		int c = (unsigned char) *(data.data++);

Return to bug 75168

Lines 6-12 Link Here

(-)Makefile (-4 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= samba	8	PORTNAME= samba
9	PORTVERSION= 3.0.9	9	PORTVERSION= 3.0.10
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	PORTEPOCH?= 1	11	PORTEPOCH?= 1
12	CATEGORIES?= net	12	CATEGORIES?= net
Lines 33-42 Link Here
33	SAMBA_RUNDIR= ${VARDIR}/run	33	SAMBA_RUNDIR= ${VARDIR}/run
34	SAMBA_LOCKDIR?= ${VARDIR}/db/samba	34	SAMBA_LOCKDIR?= ${VARDIR}/db/samba
35	SAMBA_PRIVATE?= ${PREFIX}/private	35	SAMBA_PRIVATE?= ${PREFIX}/private
36	SAMBA_CONFDIR= ${PREFIX}/etc	36	SAMBA_CONFDIR?= ${PREFIX}/etc
37	SAMBA_SWATDIR= ${PREFIX}/share/swat	37	SAMBA_SWATDIR= ${PREFIX}/share/swat
38	SAMBA_LIBDIR= ${PREFIX}/lib	38	SAMBA_LIBDIR= ${PREFIX}/lib
39	RC_DIR= ${SAMBA_CONFDIR}/rc.d	39	RC_DIR= ${PREFIX}/etc/rc.d
40	SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf	40	SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf
41		41
42	CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \	42	CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
Lines 259-265 Link Here
259		259
260	PLIST_SUB+= RC_DIR=${RC_DIR} \	260	PLIST_SUB+= RC_DIR=${RC_DIR} \
261	SAMBA_LOGDIR=${SAMBA_LOGDIR} \	261	SAMBA_LOGDIR=${SAMBA_LOGDIR} \
262	SAMBA_LOCKDIR=${SAMBA_LOCKDIR}	262	SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
		263	SAMBA_CONFIG=${SAMBA_CONFIG}
263		264
264	RC_SCRIPTS_SUB= PREFIX=${PREFIX} \	265	RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
265	CUPS=${CUPS} \	266	CUPS=${CUPS} \

Lines 1-23 Link Here

(-)files/patch-lib_util_str.c (-6 / +6 lines)
1	--- lib/util_str.c.orig Tue Apr 20 22:42:55 2004	1	--- lib/util_str.c.orig Thu Dec 16 20:46:53 2004
2	+++ lib/util_str.c Fri May 14 02:02:30 2004	2	+++ lib/util_str.c Thu Dec 16 20:48:54 2004
3	@@ -1980,10 +1980,16 @@	3	@@ -2008,10 +2008,16 @@
4	{	4	{
5	int bits = 0;	5	int bits = 0;
6	int char_count = 0;	6	int char_count = 0;
7	- size_t out_cnt = 0;	7	- size_t out_cnt = 0;
8	- size_t len = data.length;	8	- size_t len = data.length;
9	- size_t output_len = data.length * 2;	9	- size_t output_len = data.length * 2;
10	- char result = malloc(output_len); / get us plenty of space */	10	- char result = SMB_MALLOC(output_len); / get us plenty of space */
11	+ size_t out_cnt, len, output_len;	11	+ size_t out_cnt, len, output_len;
12	+ char *result;	12	+ char *result;
13	+	13	+
14	+ if (!data.length \|\| !data.data)	14	+ if (!data.length \|\| !data.data)
15	+ return NULL;	15	+ return NULL;
16	+	16	+
17	+ out_cnt = 0;	17	+ out_cnt = 0;
18	+ len = data.length;	18	+ len = data.length;
19	+ output_len = data.length * 2;	19	+ output_len = data.length * 2;
20	+ result = malloc(output_len); /* get us plenty of space */	20	+ result = SMB_MALLOC(output_len); /* get us plenty of space */
21		21
22	while (len-- && out_cnt < (data.length * 2) - 5) {	22	while (len-- && out_cnt < (data.length * 2) - 5) {
23	int c = (unsigned char) *(data.data++);	23	int c = (unsigned char) *(data.data++);