Date: Sat, 24 Oct 2009 17:10:26 -0200 (BRST) From: Sylvio Cesar <scjamorim@bsd.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Cc: x11@FreeBSD.org Subject: ports/139914: [PATCH] x11/libSM: update to 1.1.1 Message-ID: <20091024191026.905A83F5F97@fbsd.scjamorim.org> Resent-Message-ID: <200910241920.n9OJK2Mf080274@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <uuid.h>
-+#elif defined(HAVE_LIBUUID)
+ #include <uuid.h>
+ #elif defined(HAVE_LIBUUID)
#include <uuid/uuid.h>
- #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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091024191026.905A83F5F97>