Date: Tue, 16 Aug 2005 19:45:23 +0200 (CEST) From: Emanuel Haupt <ehaupt@critical.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/85002: update: security/proxytunnel 1.2.3 -> 1.5.0, take maintainership Message-ID: <200508161745.j7GHjNQL034795@beaver.critical.ch> Resent-Message-ID: <200508161750.j7GHoEnT068373@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85002
>Category: ports
>Synopsis: update: security/proxytunnel 1.2.3 -> 1.5.0, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 16 17:50:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Emanuel Haupt
>Release: FreeBSD 5.4-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD beaver.critical.ch 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #0: Wed Jul 27 20:19:15 CEST 2005 root@beaver.critical.ch:/usr/obj/usr/src/RELENG_5_4/src/sys/BEAVER i386
>Description:
- update: security/proxytunnel 1.2.3 -> 1.5.0
- take maintainership
cvs:
- remove files/patch-Makefile
- add files/patch-ntlm.c
>How-To-Repeat:
>Fix:
--- proxytunnel.patch begins here ---
diff -uNr proxytunnel.orig/Makefile proxytunnel/Makefile
--- proxytunnel.orig/Makefile Thu Jan 13 22:31:40 2005
+++ proxytunnel/Makefile Tue Aug 16 19:35:49 2005
@@ -1,31 +1,39 @@
# New ports collection makefile for: proxytunnel
-# Date created: Sun Nov 25 15:16:44 BRST 2001
-# Whom: Hammurabi Mendes <hmendes@brturbo.com>
+# Date created: Sun Nov 25 15:16:44 BRST 2001
+# Whom: Hammurabi Mendes <hmendes@brturbo.com>
#
# $FreeBSD: ports/security/proxytunnel/Makefile,v 1.8 2005/01/13 21:31:40 niels Exp $
#
PORTNAME= proxytunnel
-PORTVERSION= 1.2.3
+PORTVERSION= 1.5.0
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ehaupt@critical.ch
COMMENT= Connects stdin and stdout to an origin server through an HTTPS proxy
-ALL_TARGET= ${PORTNAME}
USE_GETOPT_LONG=yes
+USE_REINPLACE= yes
+
+ALL_TARGET= ${PORTNAME}
PLIST_FILES= bin/proxytunnel
PORTDOCS= CHANGES CREDITS README
+post-patch:
+ @${REINPLACE_CMD} -e '/^CFLAGS*/d; /^CC*/d' ${WRKSRC}/Makefile
+
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-.ifndef(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
.endif
.include <bsd.port.mk>
diff -uNr proxytunnel.orig/distinfo proxytunnel/distinfo
--- proxytunnel.orig/distinfo Thu Jan 13 22:31:40 2005
+++ proxytunnel/distinfo Tue Aug 16 19:35:49 2005
@@ -1,2 +1,2 @@
-MD5 (proxytunnel-1.2.3.tgz) = 83a2f9994bfb20232f5a039032f13ed4
-SIZE (proxytunnel-1.2.3.tgz) = 24966
+MD5 (proxytunnel-1.5.0.tgz) = 2a36409580391e25421fc06e82eed4ce
+SIZE (proxytunnel-1.5.0.tgz) = 56775
diff -uNr proxytunnel.orig/files/patch-Makefile proxytunnel/files/patch-Makefile
--- proxytunnel.orig/files/patch-Makefile Thu Jan 13 22:31:40 2005
+++ proxytunnel/files/patch-Makefile Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.orig Thu Jan 13 15:45:50 2005
-+++ Makefile Thu Jan 13 15:46:00 2005
-@@ -2,8 +2,6 @@
- #
- # Please uncomment the appropriate settings
-
--CC = gcc
--CFLAGS = -Wall -DHAVE_GETOPT_LONG
- LDFLAGS =
- INSTALLPATH = $(DESTDIR)/usr/local/bin
- MANPATH = $(DESTDIR)/usr/local/man/man1
diff -uNr proxytunnel.orig/files/patch-ntlm.c proxytunnel/files/patch-ntlm.c
--- proxytunnel.orig/files/patch-ntlm.c Thu Jan 1 01:00:00 1970
+++ proxytunnel/files/patch-ntlm.c Tue Aug 16 19:35:49 2005
@@ -0,0 +1,18 @@
+--- ntlm.c.orig Mon Aug 15 12:05:33 2005
++++ ntlm.c Tue Aug 16 19:33:37 2005
+@@ -70,13 +70,14 @@
+
+ int len = unbase64(t2_buf, buf, TYPE2_BUF_SIZE);
+ int i;
++ ntlm_type2 *t2;
+
+ if (len <= 0) {
+ message("parse_type2: failed to decode the message\n");
+ return -1;
+ }
+
+- ntlm_type2 *t2 = (ntlm_type2 *)t2_buf;
++ t2 = (ntlm_type2 *)t2_buf;
+
+ if (strcmp(t2->signature, "NTLMSSP") != 0) {
+ message("parse_type2: Signature did not match\n");
diff -uNr proxytunnel.orig/pkg-descr proxytunnel/pkg-descr
--- proxytunnel.orig/pkg-descr Thu Jan 17 22:18:22 2002
+++ proxytunnel/pkg-descr Tue Aug 16 19:35:49 2005
@@ -1,5 +1,5 @@
-A program that connects stdin and stdout to an origin server somewhere
-in the Internet through an industry standard HTTPS proxy.
+A program that connects stdin and stdout to an origin server somewhere in the
+Internet through an industry standard HTTPS proxy.
Author: Jos Visser <josv@osp.nl>, Mark Janssen <maniac@maniac.nl>
WWW: http://proxytunnel.sourceforge.net/
--- proxytunnel.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508161745.j7GHjNQL034795>