[csw-devel] SF.net SVN: gar:[10575] csw/mgar/pkg/tmux/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Jul 23 11:43:47 CEST 2010
Revision: 10575
http://gar.svn.sourceforge.net/gar/?rev=10575&view=rev
Author: dmichelsen
Date: 2010-07-23 09:43:47 +0000 (Fri, 23 Jul 2010)
Log Message:
-----------
tmux: Update to 1.3
Modified Paths:
--------------
csw/mgar/pkg/tmux/trunk/Makefile
csw/mgar/pkg/tmux/trunk/checksums
csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch
csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch
Added Paths:
-----------
csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch
Removed Paths:
-------------
csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch
Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile 2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/Makefile 2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,5 +1,5 @@
GARNAME = tmux
-GARVERSION = 1.2
+GARVERSION = 1.3
CATEGORIES = apps
DESCRIPTION = Terminal Multiplexer
@@ -8,9 +8,10 @@
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
DISTFILES += COPYING
+
PATCHFILES = 0001-old-style-patch-0000-stdint.patch
PATCHFILES += 0002-Fix-one-more-inttypes.h.patch
-PATCHFILES += 0001-Add-Solaris-fixes.patch
+PATCHFILES += 0003-Add-fix-for-missing-MAXHOSTNAMELEN.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-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/checksums 2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,5 +1,5 @@
-13c90823861d90f79620de09cd5ff0a5 0001-Add-Solaris-fixes.patch
-eb2b06cbb9c101e1687caf727e747c68 0001-old-style-patch-0000-stdint.patch
-3a7d0d4c2610a3c0fb418d1db40be856 0002-Fix-one-more-inttypes.h.patch
+58b41f4648140297ed218db06a023450 0001-old-style-patch-0000-stdint.patch
+6d6be91f763e1b4c15ec8145efbda66e 0002-Fix-one-more-inttypes.h.patch
+2a87ff8258d61d719a3b046a6d68d2d2 0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch
8ad333c4590c5ed45f1b4d0218ede7a7 COPYING
-748fbe7bb5f86812e19bd6005ff21a5a tmux-1.2.tar.gz
+96e60cb206de2db0610b9fb6a64c2251 tmux-1.3.tar.gz
Deleted: csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch 2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch 2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,114 +0,0 @@
-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
-
Modified: csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch 2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch 2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,16 +1,15 @@
-From aa5dc9009a7a677c50d1205b69bbcd6191e3adf3 Mon Sep 17 00:00:00 2001
+From a2255d651e3a64c0133d56533d934260b71d1cc5 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
Date: Wed, 12 May 2010 10:21:45 +0200
Subject: [PATCH 1/3] old style patch: 0000-stdint.patch
---
input-keys.c | 2 +-
- input.c | 2 +-
osdep-freebsd.c | 2 +-
tmux.h | 2 +-
window.c | 2 +-
xmalloc.c | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
+ 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/input-keys.c b/input-keys.c
index 1e2b18e..afcecaa 100644
@@ -25,19 +24,6 @@
#include <stdlib.h>
#include <string.h>
-diff --git a/input.c b/input.c
-index 0928195..180bb96 100644
---- a/input.c
-+++ b/input.c
-@@ -18,7 +18,7 @@
-
- #include <sys/types.h>
-
--#include <stdint.h>
-+#include <sys/inttypes.h>
- #include <stdlib.h>
- #include <string.h>
-
diff --git a/osdep-freebsd.c b/osdep-freebsd.c
index ddd865e..4dad659 100644
--- a/osdep-freebsd.c
@@ -52,7 +38,7 @@
#include <string.h>
#include <unistd.h>
diff --git a/tmux.h b/tmux.h
-index 1f7c010..918aba5 100644
+index c8b48f3..d78b46e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -31,7 +31,7 @@
@@ -65,7 +51,7 @@
#include <termios.h>
diff --git a/window.c b/window.c
-index 8629943..a8668db 100644
+index 13439c9..e1506a5 100644
--- a/window.c
+++ b/window.c
@@ -24,7 +24,7 @@
@@ -91,5 +77,5 @@
#include <string.h>
--
-1.7.0
+1.7.1
Modified: csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch 2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch 2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,4 +1,4 @@
-From e64811a62b8fefe02d0fbc6c406e629c35d93f7a Mon Sep 17 00:00:00 2001
+From 5b87d0623c11043f670ec4e2d11197a9030edda1 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
Date: Wed, 12 May 2010 14:38:28 +0200
Subject: [PATCH 2/3] Fix one more inttypes.h
@@ -21,5 +21,5 @@
#include "tmux.h"
--
-1.7.0
+1.7.1
Added: csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch 2010-07-23 09:43:47 UTC (rev 10575)
@@ -0,0 +1,26 @@
+From 374b542205a8ebee89c123f203600c627a1bdd45 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 23 Jul 2010 11:25:22 +0200
+Subject: [PATCH 3/3] Add fix for missing MAXHOSTNAMELEN
+
+---
+ screen.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/screen.c b/screen.c
+index e6d56c9..ee36024 100644
+--- a/screen.c
++++ b/screen.c
+@@ -22,6 +22,9 @@
+ #include <string.h>
+ #include <unistd.h>
+
++/* For MAXHOSTNAMELEN */
++#include <netdb.h>
++
+ #include "tmux.h"
+
+ void screen_resize_x(struct screen *, u_int);
+--
+1.7.1
+
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