Date: 19 Dec 2005 10:49:30 -0200 From: Jean Milanez Melo <jmelo@freebsdbrasil.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/90645: [maintainer update]: security/samba-vscan fix atoll problem on 4.X Message-ID: <20051219124930.60683.qmail@capeta.freebsdbrasil.com.br> Resent-Message-ID: <200512191250.jBJCo6em021455@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90645
>Category: ports
>Synopsis: [maintainer update]: security/samba-vscan fix atoll problem on 4.X
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 19 12:50:05 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jean Milanez Melo
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD capeta.freebsdbrasil.com.br 5.3-STABLE FreeBSD 5.3-STABLE #5: Wed Mar 2 15:03:19 BRT 2005 eksffa@capeta.freebsdbrasil.com.br:/usr/obj/usr/src/sys/CAPETA i386
>Description:
- Fix atoll problem with FreeBSD 4.X.
>How-To-Repeat:
>Fix:
--- samba-vscan.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/samba-vscan/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 12 Sep 2005 15:08:11 -0000 1.5
+++ Makefile 19 Dec 2005 12:44:43 -0000
@@ -28,6 +28,12 @@
PKGMESSAGE= ${WRKDIR}/pkg-message
VSCAN_SAMBA_PORT?=samba3
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES=${FILESDIR}/extra_patch-*
+.endif
+
.if ${VSCAN_SAMBA_PORT} == "samba3"
PLIST_SUB= VFSDIR=lib/samba/vfs
.else
@@ -58,4 +64,4 @@
@${SED} "s|%%PREFIX%%|${PREFIX}|g;" ${.CURDIR}/pkg-message > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: files/extra_patch-vscan-parameter.c
===================================================================
RCS file: files/extra_patch-vscan-parameter.c
diff -N files/extra_patch-vscan-parameter.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/extra_patch-vscan-parameter.c 19 Dec 2005 12:44:43 -0000
@@ -0,0 +1,10 @@
+--- global/vscan-parameter.c.orig Mon Dec 12 01:36:54 2005
++++ global/vscan-parameter.c Mon Dec 12 01:36:54 2005
+@@ -162,6 +162,7 @@
+ */
+ /* FIXME: changed atoi to atoll, but atoll might not be available
+ on all platforms! */
++ #define atoll(a) strtoll((a), (char **)NULL, 10)
+ vscan_config->common.max_size = atoll(value);
+ DEBUG(3, ("max file size is: %lld\n", (long long)vscan_config->common.max_size));
+ } else if ( StrCaseCmp("verbose file logging", param) == 0 ) {
--- samba-vscan.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051219124930.60683.qmail>