From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 11 15:30:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C08401065671 for ; Tue, 11 Mar 2008 15:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 818AB8FC15 for ; Tue, 11 Mar 2008 15:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m2BFU13K034539 for ; Tue, 11 Mar 2008 15:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m2BFU1W8034538; Tue, 11 Mar 2008 15:30:01 GMT (envelope-from gnats) Resent-Date: Tue, 11 Mar 2008 15:30:01 GMT Resent-Message-Id: <200803111530.m2BFU1W8034538@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Douglas K. Rand" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D839F106567B for ; Tue, 11 Mar 2008 15:24:45 +0000 (UTC) (envelope-from rand@meridian-enviro.com) Received: from newman.meridian-enviro.com (newman.meridian-enviro.com [12.192.92.56]) by mx1.freebsd.org (Postfix) with ESMTP id 225888FC1C for ; Tue, 11 Mar 2008 15:24:44 +0000 (UTC) (envelope-from rand@meridian-enviro.com) Received: from delta.meridian-enviro.com (delta.meridian-enviro.com [10.10.10.43]) by newman.meridian-enviro.com (8.13.6/8.13.6) with ESMTP id m2BFOixI027462; Tue, 11 Mar 2008 10:24:44 -0500 (CDT) (envelope-from rand@meridian-enviro.com) Received: (from rand@localhost) by delta.meridian-enviro.com (8.14.2/8.14.2/Submit) id m2BFOipS052047; Tue, 11 Mar 2008 10:24:44 -0500 (CDT) (envelope-from rand) Message-Id: <200803111524.m2BFOipS052047@delta.meridian-enviro.com> Date: Tue, 11 Mar 2008 10:24:44 -0500 (CDT) From: "Douglas K. Rand" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kuriyama@FreeBSD.org Subject: ports/121604: [upgrade] net/tramp upgrade to to 2.1.12 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Douglas K. Rand" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2008 15:30:01 -0000 >Number: 121604 >Category: ports >Synopsis: [upgrade] net/tramp upgrade to to 2.1.12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 11 15:30:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Douglas K. Rand >Release: FreeBSD 7.0-RELEASE i386 >Organization: Meridian Environmental Technology, Inc. >Environment: System: FreeBSD delta.meridian-enviro.com 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Fri Feb 29 22:49:00 CST 2008 root@delta.meridian-enviro.com:/usr/obj/usr/src/sys/DELTA i386 >Description: Upgrade the net/tramp port from 2.1.7 to 2.1.12. >How-To-Repeat: >Fix: diff -urN tramp.orig/Makefile tramp/Makefile --- tramp.orig/Makefile 2007-09-29 23:47:17.000000000 -0500 +++ tramp/Makefile 2008-03-11 10:03:29.000000000 -0500 @@ -6,7 +6,7 @@ # PORTNAME= tramp -PORTVERSION= 2.1.7 +PORTVERSION= 2.1.12 PORTREVISION= 2 CATEGORIES= net elisp MASTER_SITES= ${MASTER_SITE_GNU} diff -urN tramp.orig/distinfo tramp/distinfo --- tramp.orig/distinfo 2006-09-23 22:55:45.000000000 -0500 +++ tramp/distinfo 2008-03-11 10:04:14.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (tramp-2.1.7.tar.gz) = afb9d8c2dec35966e8ee093ba17697ba -SHA256 (tramp-2.1.7.tar.gz) = 11d4d5c4ac2169fde263ec7482d409133486997d8b5459d4307294584bce4b8b -SIZE (tramp-2.1.7.tar.gz) = 287084 +MD5 (tramp-2.1.12.tar.gz) = 03bda407ad337469b8042cee157ecee8 +SHA256 (tramp-2.1.12.tar.gz) = ac1037ede56966709fbe9519b9cfff404394dbae609bc3253ce41ce512613fb6 +SIZE (tramp-2.1.12.tar.gz) = 338034 diff -urN tramp.orig/files/patch-configure.ac tramp/files/patch-configure.ac --- tramp.orig/files/patch-configure.ac 2005-02-21 19:02:08.000000000 -0600 +++ tramp/files/patch-configure.ac 2008-03-11 10:08:12.000000000 -0500 @@ -1,6 +1,6 @@ ---- configure.ac.orig Sun Jan 16 19:43:17 2005 -+++ configure.ac Tue Feb 22 09:45:18 2005 -@@ -58,12 +58,11 @@ +--- configure.ac.orig 2007-12-23 05:39:52.000000000 -0600 ++++ configure.ac 2008-03-11 10:07:43.000000000 -0500 +@@ -55,11 +55,10 @@ AC_EMACS_INFO # Handle contrib files. "-" must be encoded as "_". @@ -9,8 +9,7 @@ AC_CONTRIB_FILES([base64_encode_region], [base64.el]) AC_CONTRIB_FILES([format_spec], [format_spec.el]) - AC_CONTRIB_FILES([md5], [md5.el], [optional]) -AC_CONTRIB_FILES([password_cache_add], [password.el], [optional]) - AC_CONTRIB_FILES([uudecode_decode_region], [uudecode.el]) - dnl run-at-time for XEmacs can be find in fsf-compat. Unfortunately, - dnl password.el doesn't honor it, and it requires run-at-time mandatory. + if test "${EMACS_GW}" = yes; then + AC_CONTRIB_FILES([socks_open_network_stream], [socks.el], [optional]) + fi diff -urN tramp.orig/files/patch-texi-Makefile.in tramp/files/patch-texi-Makefile.in --- tramp.orig/files/patch-texi-Makefile.in 2006-09-04 20:25:23.000000000 -0500 +++ tramp/files/patch-texi-Makefile.in 2008-03-11 10:15:53.000000000 -0500 @@ -1,7 +1,7 @@ ---- texi/Makefile.in.orig Wed Mar 15 06:27:20 2006 -+++ texi/Makefile.in Tue Sep 5 08:44:47 2006 -@@ -50,10 +50,10 @@ - TEXI_FILES = tramp.texi trampver.texi \ +--- texi/Makefile.in.orig 2007-09-28 09:32:11.000000000 -0500 ++++ texi/Makefile.in 2008-03-11 10:11:25.000000000 -0500 +@@ -51,10 +51,10 @@ + TEXI_FILES = tramp.texi trampver.texi doclicense.texi \ $(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi) JA_TEXI_FILES = $(if $(findstring yes, @JA_MANUAL@), tramp_ja.texi) -INFO_FILES = $(localinfodir)/tramp \ @@ -15,7 +15,7 @@ CLEAN_FILES = @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*) # To be used by maintainer only -@@ -66,19 +66,19 @@ +@@ -67,19 +67,19 @@ tramp: $(INFO_FILES) $(localinfodir)/dir @@ -30,9 +30,9 @@ -$(localinfodir)/tramp $(localinfodir)/tramp_ja: $(TEXI_FILES) $(JA_TEXI_FILES) +$(localinfodir)/%.info: $(TEXI_FILES) $(JA_TEXI_FILES) $(MKDIR) $(dir $@) - $(MAKEINFO) --footnote-style=end -D $(EMACS_INFO) -D $(JA_MANUAL) \ -- -D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi -+ -D $(INSTALL_CHAPTER) -o $@ $*.texi + $(MAKEINFO) --footnote-style=end -D $(EMACS_GW) -D $(EMACS_INFO) \ +- -D $(JA_MANUAL) -D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi ++ -D $(JA_MANUAL) -D $(INSTALL_CHAPTER) -o $@ $*.texi -$(DESTDIR)$(infodir)/tramp $(DESTDIR)$(infodir)/tramp_ja: +$(DESTDIR)$(infodir)/tramp.info $(DESTDIR)$(infodir)/tramp_ja.info: diff -urN tramp.orig/files/patch-tramp.el tramp/files/patch-tramp.el --- tramp.orig/files/patch-tramp.el 2006-09-23 22:55:45.000000000 -0500 +++ tramp/files/patch-tramp.el 1969-12-31 18:00:00.000000000 -0600 @@ -1,22 +0,0 @@ ---- lisp/tramp.el.orig Sat Sep 23 19:12:34 2006 -+++ lisp/tramp.el Sat Sep 23 19:13:19 2006 -@@ -5922,8 +5922,8 @@ - "Return the right method string to use. - This is METHOD, if non-nil. Otherwise, do a lookup in - `tramp-default-method-alist'." -- (if (tramp-completion-mode) -- method -+; (if (tramp-completion-mode) -+; method - (or method - (let ((choices tramp-default-method-alist) - lmethod item) -@@ -5934,7 +5934,7 @@ - (setq lmethod (nth 2 item)) - (setq choices nil))) - lmethod) -- tramp-default-method))) -+ tramp-default-method));) - - (defsubst tramp-find-user (method user host) - "Return the right user string to use. >Release-Note: >Audit-Trail: >Unformatted: