From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 20 10:30:04 2009 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 54EFD10656CA for ; Tue, 20 Oct 2009 10:30:04 +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 184E08FC12 for ; Tue, 20 Oct 2009 10:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n9KAU339040821 for ; Tue, 20 Oct 2009 10:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n9KAU3Kw040816; Tue, 20 Oct 2009 10:30:03 GMT (envelope-from gnats) Resent-Date: Tue, 20 Oct 2009 10:30:03 GMT Resent-Message-Id: <200910201030.n9KAU3Kw040816@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, MURAOKA Daisuke Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E09E106566B for ; Tue, 20 Oct 2009 10:25:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 1D4C28FC15 for ; Tue, 20 Oct 2009 10:25:07 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n9KAP6B2088556 for ; Tue, 20 Oct 2009 10:25:06 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n9KAP6sU088547; Tue, 20 Oct 2009 10:25:06 GMT (envelope-from nobody) Message-Id: <200910201025.n9KAP6sU088547@www.freebsd.org> Date: Tue, 20 Oct 2009 10:25:06 GMT From: MURAOKA Daisuke To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/139794: [PATCH] net/ruby-ldap: update to 0.9.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Oct 2009 10:30:04 -0000 >Number: 139794 >Category: ports >Synopsis: [PATCH] net/ruby-ldap: update to 0.9.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 20 10:30:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: MURAOKA Daisuke >Release: FreeBSD 7.1-RELEASE-p8 i386 >Organization: >Environment: FreeBSD freebsd.localdomain 7.1-RELEASE-p8 FreeBSD 7.1-RELEASE-p8 #0: Fri Oct 2 07:10:41 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: - Update to 0.9.9 - Update MASTER_SITES - Update pkg-descr(Author and WWW) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN ruby-ldap.orig/Makefile ruby-ldap/Makefile --- ruby-ldap.orig/Makefile 2009-08-22 09:31:42.000000000 +0900 +++ ruby-ldap/Makefile 2009-10-16 11:19:35.000000000 +0900 @@ -6,10 +6,10 @@ # PORTNAME= ldap -PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTVERSION= 0.9.9 CATEGORIES= net ruby -MASTER_SITES= SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION} +MASTER_SITES= RF +MASTER_SITE_SUBDIR= ruby-${PORTNAME} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ruby-${PORTNAME}-${PORTVERSION} DIST_SUBDIR= ruby @@ -30,28 +30,12 @@ IGNORE= you should set WITH_LDAP variable to openldap1, openldap2 or ldapsdk .endif +USE_BZIP2= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes .include -.if ${WITH_LDAP} == openldap2 -. if exists(${LOCALBASE}/bin/ldapwhoami) -_OPENLDAP_VER!= ${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.(3|4).*/\1\2/' -. endif - -. if defined(_OPENLDAP_VER) -LDAPVER= ${_OPENLDAP_VER} -. elif defined(DEFAULT_OPENLDAP_VER) -LDAPVER= ${DEFAULT_OPENLDAP_VER} -. else -LDAPVER= 24 -. endif -. if ${LDAPVER} == 24 -EXTRA_PATCHES= ${FILESDIR}/extra::patch-ldap.c ${FILESDIR}/extra::patch-conn.c -. endif -.endif - # Configure options: # --with-ldap specify the ldap directory # --with-ldap-incdir specify the directory which contains ldap.h and lber.h diff -ruN ruby-ldap.orig/distinfo ruby-ldap/distinfo --- ruby-ldap.orig/distinfo 2006-10-03 22:19:20.000000000 +0900 +++ ruby-ldap/distinfo 2009-07-24 11:47:12.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (ruby/ruby-ldap-0.9.7.tar.gz) = 373d07cb833fac6d907652f7c8ac7480 -SHA256 (ruby/ruby-ldap-0.9.7.tar.gz) = be8db063c98ff9de317983860048b3391e311ff8c961851bd01c29f0bdc8edec -SIZE (ruby/ruby-ldap-0.9.7.tar.gz) = 63870 +MD5 (ruby/ruby-ldap-0.9.9.tar.bz2) = 77ae221f2232ad6e24f88d7cf652d1b1 +SHA256 (ruby/ruby-ldap-0.9.9.tar.bz2) = 59459bb38eb24953fa817cee7a62959904119602daab36ad70fe8b78bb958aab +SIZE (ruby/ruby-ldap-0.9.9.tar.bz2) = 55225 diff -ruN ruby-ldap.orig/files/extra::patch-conn.c ruby-ldap/files/extra::patch-conn.c --- ruby-ldap.orig/files/extra::patch-conn.c 2009-02-20 04:38:02.000000000 +0900 +++ ruby-ldap/files/extra::patch-conn.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,48 +0,0 @@ ---- conn.c.orig 2009-02-19 21:50:36.000000000 +0300 -+++ conn.c 2009-02-19 21:52:45.000000000 +0300 -@@ -497,8 +497,20 @@ - #ifdef LDAP_OPT_X_TLS_KEYFILE - case LDAP_OPT_X_TLS_KEYFILE: - #endif --#ifdef LDAP_OPT_X_TLS_PROTOCOL -- case LDAP_OPT_X_TLS_PROTOCOL: -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL2 -+ case LDAP_OPT_X_TLS_PROTOCOL_SSL2: -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ case LDAP_OPT_X_TLS_PROTOCOL_SSL3: -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ case LDAP_OPT_X_TLS_PROTOCOL_TLS1_0: -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ case LDAP_OPT_X_TLS_PROTOCOL_TLS1_1: -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ case LDAP_OPT_X_TLS_PROTOCOL_TLS1_2: - #endif - #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE - case LDAP_OPT_X_TLS_CIPHER_SUITE: -@@ -627,8 +639,20 @@ - #ifdef LDAP_OPT_X_TLS_KEYFILE - case LDAP_OPT_X_TLS_KEYFILE: - #endif --#ifdef LDAP_OPT_X_TLS_PROTOCOL -- case LDAP_OPT_X_TLS_PROTOCOL: -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL2 -+ case LDAP_OPT_X_TLS_PROTOCOL_SSL2: -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ case LDAP_OPT_X_TLS_PROTOCOL_SSL3: -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ case LDAP_OPT_X_TLS_PROTOCOL_TLS1_0: -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ case LDAP_OPT_X_TLS_PROTOCOL_TLS1_1: -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ case LDAP_OPT_X_TLS_PROTOCOL_TLS1_2: - #endif - #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE - case LDAP_OPT_X_TLS_CIPHER_SUITE: diff -ruN ruby-ldap.orig/files/extra::patch-ldap.c ruby-ldap/files/extra::patch-ldap.c --- ruby-ldap.orig/files/extra::patch-ldap.c 2009-02-20 04:38:02.000000000 +0900 +++ ruby-ldap/files/extra::patch-ldap.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,25 +0,0 @@ ---- ldap.c.orig 2009-02-19 21:53:02.000000000 +0300 -+++ ldap.c 2009-02-19 21:53:58.000000000 +0300 -@@ -420,8 +420,20 @@ - #ifdef LDAP_OPT_X_TLS - rb_ldap_define_opt (LDAP_OPT_X_TLS); - #endif --#ifdef LDAP_OPT_X_TLS_PROTOCOL -- rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL); -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL2 -+ rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_SSL2); -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3 -+ rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_SSL3); -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_TLS1_0 -+ rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_TLS1_0); -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_TLS1_1 -+ rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_TLS1_1); -+#endif -+#ifdef LDAP_OPT_X_TLS_PROTOCOL_TLS1_2 -+ rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_TLS1_2); - #endif - #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE - rb_ldap_define_opt (LDAP_OPT_X_TLS_CIPHER_SUITE); diff -ruN ruby-ldap.orig/pkg-descr ruby-ldap/pkg-descr --- ruby-ldap.orig/pkg-descr 2005-09-05 22:12:45.000000000 +0900 +++ ruby-ldap/pkg-descr 2009-10-16 09:38:33.000000000 +0900 @@ -5,4 +5,5 @@ Author: Takaaki Tateishi Author: Ian Macdonald -WWW: http://ruby-ldap.sourceforge.net/ +Author: Alexey Chebotar +WWW: http://rubyforge.org/projects/ruby-ldap/ >Release-Note: >Audit-Trail: >Unformatted: