Attachment 85624 Details for Bug 121881 – file.diff

[patch] file.diff

file.diff (text/plain), 2.61 KB, created by bf on 2008-03-19 21:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bf

Created: 2008-03-19 21:10:00 UTC

Size: 2.61 KB

patch

obsolete

>diff -ruN tor-devel.orig/Makefile tor-devel/Makefile
>--- tor-devel.orig/Makefile	2008-03-06 04:45:40.000000000 -0500
>+++ tor-devel/Makefile	2008-03-19 16:11:48.656234425 -0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tor
>-DISTVERSION=	0.2.0.21-rc
>+DISTVERSION=	0.2.0.22-rc
> CATEGORIES=	security net
> MASTER_SITES=	http://www.torproject.org/dist/ \
> 		http://mirror.onionland.org/dist/
>@@ -20,8 +20,12 @@
> 
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
> 
>-OPTIONS=	CELLPOOL "memory pool allocator for cells" on \
>+OPTIONS=	BUFFREELISTS "freelists for buffer RAM" on \
>+		CELLPOOL "memory pool allocator for cells" on \
>+		TCMALLOC "use the tcmalloc memory allocation library" off \
> 		THREADS "multi-threading support" on \
> 		TRANSPARENT "transparent proxy support" on \
> 		VIDALIA "Vidalia graphical Tor controller" off
>@@ -36,8 +40,11 @@
> 
> .include <bsd.port.pre.mk>
> 
>-CONFIGURE_ENV+=	CPPFLAGS+=-I{LOCALBASE}/include \
>-		LDFLAGS+=-L{LOCALBASE}/lib
>+.if defined(WITH_BUFFREELISTS)
>+CONFIGURE_ARGS+=	--enable-buf-freelists
>+.else
>+CONFIGURE_ARGS+=	--disable-buf-freelists
>+.endif
> 
> .if defined(WITH_CELLPOOL)
> CONFIGURE_ARGS+=	--enable-cell-pool
>@@ -45,9 +52,14 @@
> CONFIGURE_ARGS+=	--disable-cell-pool
> .endif
> 
>+.if defined(WITH_TCMALLOC)
>+CONFIGURE_ARGS+=	--with-tcmalloc
>+LIB_DEPENDS+=		tcmalloc:${PORTSDIR}/devel/google-perftools
>+.endif
>+
> .if defined(WITH_THREADS)
> CONFIGURE_ARGS+=	--enable-threads
>-CONFIGURE_ENV+=	LDFLAGS+={PTHREAD_LIBS}
>+CFLAGS+=		${PTHREAD_CFLAGS}
> .else
> CONFIGURE_ARGS+=	--disable-threads
> .endif
>@@ -67,13 +79,11 @@
> 		${WRKSRC}/contrib/tor-tsocks.conf.sample
> 	@${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
> 		${WRKSRC}/contrib/Makefile.in
>-#fix typos in configure scripts, undesirable compiler flags, wrong location of in6.h
> 	@${FIND} ${WRKSRC} -type f | ${XARGS} \
> 		-n 10 ${REINPLACE_CMD} -E \
> 		-e 's|-g -O2||g' \
> 		-e 's|-O2||g' \
> 		-e 's|-g -O||g' \
>-		-e 's|netintet|netinet|g' \
> 		-e 's|netinet/in6|netinet6/in6|g'
> 
> post-configure:
>diff -ruN tor-devel.orig/distinfo tor-devel/distinfo
>--- tor-devel.orig/distinfo	2008-03-06 04:45:40.000000000 -0500
>+++ tor-devel/distinfo	2008-03-19 16:11:48.652231402 -0400
>@@ -1,3 +1,3 @@
>-MD5 (tor-0.2.0.21-rc.tar.gz) = cfedbbc30e687b427e0aa0d006fde0c6
>-SHA256 (tor-0.2.0.21-rc.tar.gz) = 6b7b161be6c573b42caaab5e4201b7797264f0dc2d27119872587f00007a68ba
>-SIZE (tor-0.2.0.21-rc.tar.gz) = 1540586
>+MD5 (tor-0.2.0.22-rc.tar.gz) = 9404ea3f6e4b01af01a34e95cd937723
>+SHA256 (tor-0.2.0.22-rc.tar.gz) = f2bed9305107d36828d4becd7e186c6aa514d713e456d4ecbc20782def55cfdd
>+SIZE (tor-0.2.0.22-rc.tar.gz) = 1541300

Actions: View | Diff

Attachments on bug 121881: 85624