[csw-devel] SF.net SVN: gar:[9865] csw/mgar/pkg/tmux/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri May 14 15:18:55 CEST 2010
Revision: 9865
http://gar.svn.sourceforge.net/gar/?rev=9865&view=rev
Author: dmichelsen
Date: 2010-05-14 13:18:55 +0000 (Fri, 14 May 2010)
Log Message:
-----------
tmux: Restructure patches to conform SF bug #3000435
Modified Paths:
--------------
csw/mgar/pkg/tmux/trunk/Makefile
csw/mgar/pkg/tmux/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch
Removed Paths:
-------------
csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch
csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch
Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile 2010-05-14 10:29:31 UTC (rev 9864)
+++ csw/mgar/pkg/tmux/trunk/Makefile 2010-05-14 13:18:55 UTC (rev 9865)
@@ -10,8 +10,7 @@
DISTFILES += COPYING
PATCHFILES = 0001-old-style-patch-0000-stdint.patch
PATCHFILES += 0002-Fix-one-more-inttypes.h.patch
-PATCHFILES += 0003-Add-definitions-for-CMSG_SPACE.patch
-PATCHFILES += 0004-Add-substitues-form-setenv-and-unsetenv.patch
+PATCHFILES += 0001-Add-Solaris-fixes.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
Modified: csw/mgar/pkg/tmux/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmux/trunk/checksums 2010-05-14 10:29:31 UTC (rev 9864)
+++ csw/mgar/pkg/tmux/trunk/checksums 2010-05-14 13:18:55 UTC (rev 9865)
@@ -1,6 +1,5 @@
+13c90823861d90f79620de09cd5ff0a5 0001-Add-Solaris-fixes.patch
eb2b06cbb9c101e1687caf727e747c68 0001-old-style-patch-0000-stdint.patch
3a7d0d4c2610a3c0fb418d1db40be856 0002-Fix-one-more-inttypes.h.patch
-53b2c368d0e3746fe4c36c4e1a1bc81b 0003-Add-definitions-for-CMSG_SPACE.patch
-38c74d4589266a545299f5df25ec7aaf 0004-Add-substitues-form-setenv-and-unsetenv.patch
8ad333c4590c5ed45f1b4d0218ede7a7 COPYING
748fbe7bb5f86812e19bd6005ff21a5a tmux-1.2.tar.gz
Added: csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch 2010-05-14 13:18:55 UTC (rev 9865)
@@ -0,0 +1,114 @@
+From cc90c6fa3786e7ef68ef87fd8a8c84e32149f38c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 14 May 2010 15:05:03 +0200
+Subject: [PATCH] Add Solaris fixes
+
+---
+ compat.h | 22 ++++++++++++++++++++++
+ compat/setenv.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ configure | 3 ++-
+ 3 files changed, 70 insertions(+), 1 deletions(-)
+ create mode 100644 compat/setenv.c
+
+diff --git a/compat.h b/compat.h
+index b7a1d58..321b0ac 100644
+--- a/compat.h
++++ b/compat.h
+@@ -92,6 +92,28 @@ typedef uint64_t u_int64_t;
+ (struct cmsghdr *)NULL)
+ #endif
+
++/*
++ * CMSG_ALIGN, CMS_SPACE and CMSG_LEN definitions are missing on Solaris.
++ * The substitutes have been taken from
++ * http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html
++ */
++
++#ifndef CMSG_ALIGN
++# ifdef __sun__
++# define CMSG_ALIGN _CMSG_DATA_ALIGN
++# else
++# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1))
++# endif
++#endif
++
++#ifndef CMSG_SPACE
++# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len))
++#endif
++
++#ifndef CMSG_LEN
++# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len))
++#endif
++
+ #ifndef INFTIM
+ #define INFTIM -1
+ #endif
+diff --git a/compat/setenv.c b/compat/setenv.c
+new file mode 100644
+index 0000000..1b3d2fd
+--- /dev/null
++++ b/compat/setenv.c
+@@ -0,0 +1,46 @@
++/* $Id$ /*
++
++/*
++ * Copyright (c) 2004 Nicholas Marriott <nicm at users.sourceforge.net>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
++ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <stdlib.h>
++
++#include "tmux.h"
++
++void
++setenv(char *n, char *v, int x)
++{
++ char buf[256];
++
++ snprintf(buf, sizeof(buf), "%s=%s", n, v);
++ putenv(buf);
++}
++
++void
++unsetenv(char *env_name)
++{
++ extern char **environ;
++ char **cc;
++ int l;
++
++ l = strlen(env_name);
++ for (cc=environ; *cc != NULL; cc++) {
++ if (strncmp(env_name, *cc, l) == 0 && ((*cc)[l] == '=' || (*cc)[l] == '\0'))
++ break;
++ }
++ for (; *cc != NULL; cc++)
++ *cc = cc[1];
++ }
+diff --git a/configure b/configure
+index 5d3c3b1..8f30560 100755
+--- a/configure
++++ b/configure
+@@ -164,7 +164,8 @@ SRCS+= osdep-sunos.c \
+ compat/vis.c \
+ compat/unvis.c \
+ compat/imsg-buffer.c \
+- compat/imsg.c
++ compat/imsg.c \
++ compat/setenv.c
+ EOF
+ ;;
+ # ------------------------------------------------------------------------------
+--
+1.7.0
+
Deleted: csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch 2010-05-14 10:29:31 UTC (rev 9864)
+++ csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch 2010-05-14 13:18:55 UTC (rev 9865)
@@ -1,66 +0,0 @@
-From b60fa77597ce86a19c9fc45b658e193498956268 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 12 May 2010 14:39:14 +0200
-Subject: [PATCH 3/3] Add definitions for CMSG_SPACE
-
----
- compat/imsg-buffer.c | 1 +
- compat/imsg.c | 1 +
- compat/solaris-compat.h | 21 +++++++++++++++++++++
- 3 files changed, 23 insertions(+), 0 deletions(-)
- create mode 100644 compat/solaris-compat.h
-
-diff --git a/compat/imsg-buffer.c b/compat/imsg-buffer.c
-index 7baaa42..8da71f8 100644
---- a/compat/imsg-buffer.c
-+++ b/compat/imsg-buffer.c
-@@ -27,6 +27,7 @@
- #include <unistd.h>
-
- #include "tmux.h"
-+#include "compat/solaris-compat.h"
-
- int buf_realloc(struct buf *, size_t);
- void buf_enqueue(struct msgbuf *, struct buf *);
-diff --git a/compat/imsg.c b/compat/imsg.c
-index 1bc6062..f209fe0 100644
---- a/compat/imsg.c
-+++ b/compat/imsg.c
-@@ -27,6 +27,7 @@
- #include <unistd.h>
-
- #include "tmux.h"
-+#include "compat/solaris-compat.h"
-
- int imsg_get_fd(struct imsgbuf *);
-
-diff --git a/compat/solaris-compat.h b/compat/solaris-compat.h
-new file mode 100644
-index 0000000..57bbb51
---- /dev/null
-+++ b/compat/solaris-compat.h
-@@ -0,0 +1,21 @@
-+/*
-+ * CMS_SPACE etc. definitions for Solaris from
-+ * http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html
-+ */
-+
-+#ifndef CMSG_ALIGN
-+# ifdef __sun__
-+# define CMSG_ALIGN _CMSG_DATA_ALIGN
-+# else
-+# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1))
-+# endif
-+#endif
-+
-+#ifndef CMSG_SPACE
-+# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len))
-+#endif
-+
-+#ifndef CMSG_LEN
-+# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len))
-+#endif
-+
---
-1.7.0
-
Deleted: csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch 2010-05-14 10:29:31 UTC (rev 9864)
+++ csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch 2010-05-14 13:18:55 UTC (rev 9865)
@@ -1,41 +0,0 @@
-From 245b536b83117992d5cb13b766d592497b448a7c Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 12 May 2010 15:04:26 +0200
-Subject: [PATCH 4/4] Add substitues form setenv and unsetenv
-
----
- window.c | 18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
-
-diff --git a/window.c b/window.c
-index a8668db..d28efc9 100644
---- a/window.c
-+++ b/window.c
-@@ -32,6 +32,24 @@
-
- #include "tmux.h"
-
-+#ifdef __sun
-+void setenv(char *n, char *v, int x) {
-+ char buf[256];
-+ snprintf(buf,sizeof(buf),"%s=%s",n,v);
-+ putenv(buf);
-+}
-+
-+void unsetenv(char *env_name) {
-+ extern char **environ;
-+ char **cc;
-+ int l;
-+ l=strlen(env_name);
-+ for (cc=environ;*cc!=NULL;cc++) {
-+ if (strncmp(env_name,*cc,l)==0 && ((*cc)[l]=='='||(*cc)[l]=='\0')) break;
-+ } for (; *cc != NULL; cc++) *cc=cc[1];
-+}
-+#endif
-+
- /*
- * Each window is attached to a number of panes, each of which is a pty. This
- * file contains code to handle them.
---
-1.7.0
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list