From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 24 19:20:02 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 A596C106568D for ; Sat, 24 Oct 2009 19:20:02 +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 65B288FC14 for ; Sat, 24 Oct 2009 19:20:02 +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 n9OJK2BY080275 for ; Sat, 24 Oct 2009 19:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n9OJK2Mf080274; Sat, 24 Oct 2009 19:20:02 GMT (envelope-from gnats) Resent-Date: Sat, 24 Oct 2009 19:20:02 GMT Resent-Message-Id: <200910241920.n9OJK2Mf080274@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, Sylvio Cesar Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D34810656C6; Sat, 24 Oct 2009 19:10:29 +0000 (UTC) (envelope-from scjamorim@bsd.com.br) Received: from mail-yx0-f171.google.com (mail-yx0-f171.google.com [209.85.210.171]) by mx1.freebsd.org (Postfix) with ESMTP id 280158FC2C; Sat, 24 Oct 2009 19:10:29 +0000 (UTC) Received: by yxe1 with SMTP id 1so8836997yxe.3 for ; Sat, 24 Oct 2009 12:10:28 -0700 (PDT) Received: by 10.151.24.21 with SMTP id b21mr20724410ybj.270.1256411428563; Sat, 24 Oct 2009 12:10:28 -0700 (PDT) Received: from fbsd.scjamorim.org (200-163-8-49.bsace705.dsl.brasiltelecom.net.br [200.163.8.49]) by mx.google.com with ESMTPS id 4sm546443ywd.14.2009.10.24.12.10.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 24 Oct 2009 12:10:28 -0700 (PDT) Received: by fbsd.scjamorim.org (Postfix, from userid 0) id 905A83F5F97; Sat, 24 Oct 2009 17:10:26 -0200 (BRST) Message-Id: <20091024191026.905A83F5F97@fbsd.scjamorim.org> Date: Sat, 24 Oct 2009 17:10:26 -0200 (BRST) From: Sylvio Cesar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: x11@FreeBSD.org Subject: ports/139914: [PATCH] x11/libSM: update to 1.1.1 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: Sat, 24 Oct 2009 19:20:02 -0000 >Number: 139914 >Category: ports >Synopsis: [PATCH] x11/libSM: update to 1.1.1 >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: Sat Oct 24 19:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sylvio Cesar >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD fbsd.scjamorim.org 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Sat Oct 10 21:33:17 BRT 2009 >Description: - Update to 1.1.1 - Changed patch files to stay right with new version Port maintainer (x11@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- libSM-1.1.1,1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/libSM/Makefile,v retrieving revision 1.26 diff -u -u -r1.26 Makefile --- Makefile 2 Aug 2009 19:36:07 -0000 1.26 +++ Makefile 24 Oct 2009 19:09:23 -0000 @@ -6,8 +6,7 @@ # PORTNAME= libSM -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1 PORTEPOCH= 1 CATEGORIES= x11 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/x11/libSM/distinfo,v retrieving revision 1.8 diff -u -u -r1.8 distinfo --- distinfo 23 Jan 2009 16:28:12 -0000 1.8 +++ distinfo 24 Oct 2009 19:09:23 -0000 @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libSM-1.1.0.tar.bz2) = 05a04c2b6382fb0054f6c70494e22733 -SHA256 (xorg/lib/libSM-1.1.0.tar.bz2) = 7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82 -SIZE (xorg/lib/libSM-1.1.0.tar.bz2) = 252599 +MD5 (xorg/lib/libSM-1.1.1.tar.bz2) = 6889a455496aaaa65b1fa05fc518d179 +SHA256 (xorg/lib/libSM-1.1.1.tar.bz2) = f50d184d8c6a031b3ff4f0d52efcfd4ffa811b0362b166a9ff9ba4c2e9aa7ce0 +SIZE (xorg/lib/libSM-1.1.1.tar.bz2) = 262305 Index: files/patch-configure.ac =================================================================== RCS file: /home/ncvs/ports/x11/libSM/files/patch-configure.ac,v retrieving revision 1.1 diff -u -u -r1.1 patch-configure.ac --- files/patch-configure.ac 23 Feb 2009 18:41:43 -0000 1.1 +++ files/patch-configure.ac 24 Oct 2009 19:09:23 -0000 @@ -1,18 +1,23 @@ ---- configure.ac.orig 2008-07-02 21:58:05.000000000 +0400 -+++ configure.ac 2009-02-23 18:50:18.000000000 +0300 -@@ -35,10 +35,13 @@ - # Needed to check for TCP & IPv6 support and set flags appropriately - XTRANS_CONNECTION_FLAGS +--- configure.ac.orig 2009-08-07 09:19:19.000000000 -0300 ++++ configure.ac 2009-10-24 16:51:55.000000000 -0200 +@@ -42,16 +42,18 @@ + + AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs])) -+AC_ARG_WITH(stduuid, AC_HELP_STRING([--with-stduuid], [Build with DCE 1.1 uuid support for client IDs])) +AM_CONDITIONAL(WITH_STDUUID, test x"$with_stduuid" != "xno") + - AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs])) --AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" != xno) -+AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno") + AC_CHECK_FUNCS([uuid_create], [], [ + if test x"$with_libuuid" != xno && test x"$have_system_uuid" != xyes; then + PKG_CHECK_MODULES(LIBUUID, uuid, [HAVE_LIBUUID=yes], [HAVE_LIBUUID=no]) + fi +- if test x"$with_libuuid" = xyes && test x"$HAVE_LIBUUID" = xno; then ++ if test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno"; then + AC_MSG_ERROR([requested libuuid support but uuid.pc not found]) + fi + ]) --if test x"$with_libuuid" != xno; then -+if test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno"; then - PKG_CHECK_MODULES(LIBUUID, uuid) - fi +-AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes) ++AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno") + XORG_RELEASE_VERSION + XORG_CHANGELOG Index: files/patch-src_sm_genid.c =================================================================== RCS file: /home/ncvs/ports/x11/libSM/files/patch-src_sm_genid.c,v retrieving revision 1.1 diff -u -u -r1.1 patch-src_sm_genid.c --- files/patch-src_sm_genid.c 23 Feb 2009 18:41:43 -0000 1.1 +++ files/patch-src_sm_genid.c 24 Oct 2009 19:09:23 -0000 @@ -1,43 +1,47 @@ ---- src/sm_genid.c.orig 2008-06-24 21:11:27.000000000 +0400 -+++ src/sm_genid.c 2009-02-23 18:51:22.000000000 +0300 -@@ -76,7 +76,9 @@ +--- src/sm_genid.c.orig 2009-08-07 06:38:31.000000000 -0300 ++++ src/sm_genid.c 2009-10-24 16:58:42.000000000 -0200 +@@ -76,7 +76,7 @@ #define TCPCONN #endif --#if defined(HAVE_LIBUUID) +-#if defined(HAVE_UUID_CREATE) +#if defined(HAVE_STDUUID) -+#include -+#elif defined(HAVE_LIBUUID) + #include + #elif defined(HAVE_LIBUUID) #include - #endif - -@@ -85,7 +87,28 @@ - SmsGenerateClientID (smsConn) - SmsConn smsConn; +@@ -86,23 +86,25 @@ + char * + SmsGenerateClientID(SmsConn smsConn) { --#if defined(HAVE_LIBUUID) +-#if defined(HAVE_UUID_CREATE) +#if defined(HAVE_STDUUID) -+ char *id; + char *id; +- char **temp; + char *str; -+ uuid_t uuid; -+ uint32_t status; -+ -+ uuid_create(&uuid, &status); + uuid_t uuid; + uint32_t status; + + uuid_create(&uuid, &status); + if (status != uuid_s_ok) -+ return NULL; -+ ++ return NULL; + +- uuid_to_string(&uuid, &temp, &status); +- +- if ((id = malloc (strlen (temp) + 2)) != NULL) +- { +- id[1] = '2'; +- strcpy (id+1, temp); + uuid_to_string(&uuid, &str, &status); + if (status != uuid_s_ok) -+ return NULL; ++ return NULL; + + if ((id = malloc (strlen (str) + 2)) != NULL) { -+ id[0] = '2'; -+ strcpy(&id[1], str); -+ } ++ id[0] = '2'; ++ strcpy(&id[1], str); + } +- +- free(temp); + free(str); -+ -+ return id; -+#elif defined(HAVE_LIBUUID) - char *id; - char temp[256]; - uuid_t uuid; + + return id; + #elif defined(HAVE_LIBUUID) --- libSM-1.1.1,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: