diff --git a/.cvsignore b/.cvsignore index 9d06fdc..0ad89ca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -c3270-3.3.6.tgz -x3270-3.3.6.tgz +suite3270-3.3.10ga4-src.tgz diff --git a/c3270-332-ncursesw.patch b/c3270-332-ncursesw.patch deleted file mode 100644 index 6c52a1d..0000000 --- a/c3270-332-ncursesw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- x3270-3.3/c3270-3.3/configure.in.ncursesw 2003-12-03 11:45:50.000000000 +0100 -+++ x3270-3.3/c3270-3.3/configure.in 2003-12-03 11:47:58.000000000 +0100 -@@ -60,7 +60,7 @@ - dnl Note that the order here is important. The last libraries should appear - dnl first, so that objects in them can be used by subsequent libraries. - AC_CHECK_LIB(util, forkpty) --AC_CHECK_LIB(ncurses, newterm, , [AC_CHECK_LIB(curses, newterm, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])]) -+AC_CHECK_LIB(ncursesw, newterm, , [ AC_CHECK_LIB(ncurses, newterm, , [AC_CHECK_LIB(curses, newterm, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])])]) - if test "$with_readline" != no; then - AC_CHECK_LIB(readline, rl_initialize) - fi diff --git a/sources b/sources index e3c49fe..7607a62 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d3eb409c406e0ff5ed9a3f0ae4b5452e c3270-3.3.6.tgz -3017011d1c33bb18a609b06379bf6ba6 x3270-3.3.6.tgz +13d904e46cf7cea1dd9b0cdb5d1a3ebd suite3270-3.3.10ga4-src.tgz diff --git a/x3270-3.3-encoding.patch b/x3270-3.3-encoding.patch deleted file mode 100644 index b1d5e01..0000000 --- a/x3270-3.3-encoding.patch +++ /dev/null @@ -1,398 +0,0 @@ ---- x3270-3.3/html/Brackets.html.encoding 2005-04-20 12:38:04.000000000 +0200 -+++ x3270-3.3/html/Brackets.html 2005-04-20 12:38:52.000000000 +0200 -@@ -1,198 +1,198 @@ -- -- -- -- -- -- -- Square Bracket Characters -+ -+ -+ -+ -+ -+ -+ Square Bracket Characters - -- -- -- --

--Square Bracket Characters

-- --

--The Problem

--Most IBM 3270 emulators have some degree of difficulty with the square-bracket --characters, [ and ]. The problem is that there is not a consistent --definition of what EBCDIC codes represent them. Hosts may define the square --bracket characters as X'BA' and X'BB' (as defined in the IBM Chararcter --Set Reference as standard EBCDIC characters), or as X'AD' and X'BD' --(which is what the IBM C compilers recognize). In addition, some (but not --all) hosts display these characters with a Graphics Escape (GE) sequence. --When the host and/or x3270 are misconfigured, the square-bracket characters --may be displayed as  and , --or Ý and ¨. --

--Host Configuration

--If you are using ISPF, you may simply need to use the correct terminal --translation table. According to the IBM's ISPF Planning and Customizing --(SC28-1298), Section 3.11, the correct translation table for displaying --square bracket characters is called 3278A. --

In VM/CMS, the commands terminal apl on and set apl on --cause the X'AD', X'BD', X'BA' and X'BB' characters to be displayed with --a Graphics Escape (GE) prefix. With terminal apl off and set --apl off in effect, they are displayed without the GE prefix. --

--x3270 Facilities

--x3270 has two facilities to deal with this situation: character sets and --keymaps. By selecting the correct character set and keymap, you can set --up x3270 to generate and display the proper codes for the square-bracket --characters. --
-charset bracket is the default mode, and is used with --hosts that use X'AD' and X'BD' for the square-bracket characters. It can --be used if the host displays these characters with or without a GE sequence.
-- --
-charset us is for use with hosts that use X'BA' and --X'BB' for the square-bracket characters, and do not display these --characters with a GE sequence.
-- --
-apl (an abbreviation for -charset apl, -keymap --apl) is for use with hosts running APL, which use GE X'AD' and GE X'BD' --to represent and display the APL2 square-bracket characters.
--Here is a table which summarizes the combinations of characters generated --and displayed in the various modes. --
  --
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
  --
keyboard generates
--		 --
graphic displayed for EBCDIC codes
--
x3270 Mode --
[ key
--		 --
] key
--		 --
X'AD'
--		 --
X'BD'
--		 --
X'BA'
--		 --
X'BB'
--		 --
GE X'BA'
--		 --
GE X'BB'
--		 --
GE X'AD'
--		 --
GE X'BD'
--
-charset bracket (default)X'AD' --
X'BD'
--		 --
[
--		 --
]
--		 --
Ý
--		 --
¨
--		 --
--		 --
--		 --
[
--		 --
]
--
-charset us --
X'BA'
--		 --
X'BB'
--		 --
Ý
--		 --
¨
--		 --
[
--		 --
]
--
-apl --
GE X'AD'
--		 --
GE X'BD'
--
-- -- -- -+ -+ -+ -+

-+Square Bracket Characters

-+ -+

-+The Problem

-+Most IBM 3270 emulators have some degree of difficulty with the square-bracket -+characters, [ and ]. The problem is that there is not a consistent -+definition of what EBCDIC codes represent them. Hosts may define the square -+bracket characters as X'BA' and X'BB' (as defined in the IBM Character -+Set Reference as standard EBCDIC characters), or as X'AD' and X'BD' -+(which is what the IBM C compilers recognize). In addition, some (but not -+all) hosts display these characters with a Graphics Escape (GE) sequence. -+When the host and/or x3270 are misconfigured, the square-bracket characters -+may be displayed as  and , -+or Ý and ¨. -+

-+Host Configuration

-+If you are using ISPF, you may simply need to use the correct terminal -+translation table. According to the IBM's ISPF Planning and Customizing -+(SC28-1298), Section 3.11, the correct translation table for displaying -+square bracket characters is called 3278A. -+

In VM/CMS, the commands terminal apl on and set apl on -+cause the X'AD', X'BD', X'BA' and X'BB' characters to be displayed with -+a Graphics Escape (GE) prefix. With terminal apl off and set -+apl off in effect, they are displayed without the GE prefix. -+

-+x3270 Facilities

-+x3270 has two facilities to deal with this situation: character sets and -+keymaps. By selecting the correct character set and keymap, you can set -+up x3270 to generate and display the proper codes for the square-bracket -+characters. -+
-charset bracket is the default mode, and is used with -+hosts that use X'AD' and X'BD' for the square-bracket characters. It can -+be used if the host displays these characters with or without a GE sequence.
-+ -+
-charset us is for use with hosts that use X'BA' and -+X'BB' for the square-bracket characters, and do not display these -+characters with a GE sequence.
-+ -+
-apl (an abbreviation for -charset apl, -keymap -+apl) is for use with hosts running APL, which use GE X'AD' and GE X'BD' -+to represent and display the APL2 square-bracket characters.
-+Here is a table which summarizes the combinations of characters generated -+and displayed in the various modes. -+
  -+
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
  -+
keyboard generates
-+		 -+
graphic displayed for EBCDIC codes
-+
x3270 Mode -+
[ key
-+		 -+
] key
-+		 -+
X'AD'
-+		 -+
X'BD'
-+		 -+
X'BA'
-+		 -+
X'BB'
-+		 -+
GE X'BA'
-+		 -+
GE X'BB'
-+		 -+
GE X'AD'
-+		 -+
GE X'BD'
-+
-charset bracket (default)X'AD' -+
X'BD'
-+		 -+
[
-+		 -+
]
-+		 -+
Ý
-+		 -+
¨
-+		 -+
-+		 -+
-+		 -+
[
-+		 -+
]
-+
-charset us -+
X'BA'
-+		 -+
X'BB'
-+		 -+
Ý
-+		 -+
¨
-+		 -+
[
-+		 -+
]
-+
-apl -+
GE X'AD'
-+		 -+
GE X'BD'
-+
-+ -+ -+ diff --git a/x3270-3.3-modularX.patch b/x3270-3.3-modularX.patch deleted file mode 100644 index bc82585..0000000 --- a/x3270-3.3-modularX.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- x3270-3.3/Makefile.rh1 2005-11-23 13:50:08.000000000 +0100 -+++ x3270-3.3/Makefile 2005-11-23 13:53:31.000000000 +0100 -@@ -134,15 +134,15 @@ - IMAKESRC = $(CONFIGSRC)/imake - DEPENDSRC = $(CONFIGSRC)/util - -- INCROOT = /usr/X11R6/include -- USRLIBDIR = /usr/X11R6/lib -+ INCROOT = /usr/include -+ USRLIBDIR = /usr/lib - VARDIR = /var - VARLIBDIR = $(VARDIR)/lib - SYSTEMUSRLIBDIR = /usr/lib - SYSTEMUSRINCDIR = /usr/include -- SHLIBDIR = /usr/X11R6/lib -+ SHLIBDIR = /usr/lib - LINTLIBDIR = $(USRLIBDIR)/lint -- MANPATH = /usr/X11R6/man -+ MANPATH = /usr/share/man - MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)1 - LIBMANDIR = $(MANSOURCEPATH)3 -@@ -291,7 +291,7 @@ - INSTDATFLAGS = -m 0444 - INSTKMEMFLAGS = -m 4711 - -- PROJECTROOT = /usr/X11R6 -+ PROJECTROOT = /usr - - CDEBUGFLAGS = -O2 -fno-strength-reduce -fno-strict-aliasing - CCOPTIONS = -@@ -362,7 +362,7 @@ - # X Window System make variables; these need to be coordinated with rules - - XTOP = $(TOP) -- BINDIR = /usr/X11R6/bin -+ BINDIR = /usr/bin - BUILDINCROOT = $(TOP)/exports - BUILDINCDIR = $(BUILDINCROOT)/include - BUILDINCTOP = ../.. -@@ -379,13 +379,13 @@ - XBUILDBINDIR = $(XBUILDINCROOT)/bin - INCDIR = $(INCROOT) - ADMDIR = /usr/adm -- LIBDIR = /usr/X11R6/lib/X11 -- LIBEXECDIR = /usr/X11R6/libexec -+ LIBDIR = /usr/lib/X11 -+ LIBEXECDIR = /usr/libexec - MODULEDIR = $(USRLIBDIR)/modules - TOP_X_INCLUDES = - XBINDIR = $(PROJECTROOT)/bin - -- INSTSRCDIR = /usr/X11R6/src -+ INSTSRCDIR = /usr/src - - ETCX11DIR = /etc/X11 - -@@ -1051,7 +1051,7 @@ - LIBX3270DIR = /usr/lib/x3270 - EXTRA_LDOPTIONS = - EXTRA_LIBRARIES = -lssl -lcrypto -lnsl -lutil -- EXTRA_INCLUDES = -+ EXTRA_INCLUDES = -I/usr/share - CC = gcc - INSTALL = /usr/bin/install -c - diff --git a/x3270-3.3-syntax.patch b/x3270-3.3-syntax.patch deleted file mode 100644 index d3cc21f..0000000 --- a/x3270-3.3-syntax.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urN x3270-3.3/3270ds.h x3270-3.3_new/3270ds.h ---- x3270-3.3/3270ds.h 2004-07-05 21:22:04.000000000 +0200 -+++ x3270-3.3_new/3270ds.h 2005-01-13 11:58:38.716890528 +0100 -@@ -285,8 +285,10 @@ - #define MINUS1 0xffffffffU - - #define SET16(ptr, val) { \ -- *((ptr)++) = ((val) & MASK16) >> 8; \ -- *((ptr)++) = ((val) & MASK08); \ -+ *(ptr) = ((val) & MASK16) >> 8; \ -+ (ptr)++; \ -+ *(ptr) = ((val) & MASK08); \ -+ (ptr)++; \ - } - #define GET16(val, ptr) { \ - (val) = *((ptr)+1); \ -diff -urN x3270-3.3/qcpp.c x3270-3.3_new/qcpp.c ---- x3270-3.3/qcpp.c 2002-12-05 00:34:18.000000000 +0100 -+++ x3270-3.3_new/qcpp.c 2005-01-13 11:59:28.924631795 +0100 -@@ -44,7 +44,7 @@ - { - int c; - char buf[1024]; -- FILE *f, *t, *o; -+ FILE *f = 0, *t, *o; - int nest = 0; - int ln = 0; - int pass[MAX_NEST]; diff --git a/x3270-3.3.10-ibmhostpath.patch b/x3270-3.3.10-ibmhostpath.patch new file mode 100644 index 0000000..afb64a6 --- /dev/null +++ b/x3270-3.3.10-ibmhostpath.patch @@ -0,0 +1,175 @@ +diff -up x3270-3.3.10ga4/c3270-3.3/c3270.man.ibmhostspath x3270-3.3.10ga4/c3270-3.3/c3270.man +--- x3270-3.3.10ga4/c3270-3.3/c3270.man.ibmhostspath 2009-12-07 13:06:22.000000000 +0100 ++++ x3270-3.3.10ga4/c3270-3.3/c3270.man 2009-12-07 13:09:17.000000000 +0100 +@@ -3204,7 +3204,7 @@ backslash character. + If more than one \fB\-xrm\fP option is given for the same resource, + the last one on the command line is used. + .SH "FILES" +-/usr/local/lib/x3270/ibm_hosts ++/etc/ibm_hosts + .br + $HOME/.c3270pro + +diff -up x3270-3.3.10ga4/c3270-3.3/glue.c.ibmhostspath x3270-3.3.10ga4/c3270-3.3/glue.c +diff -up x3270-3.3.10ga4/c3270-3.3/host.c.ibmhostspath x3270-3.3.10ga4/c3270-3.3/host.c +--- x3270-3.3.10ga4/c3270-3.3/host.c.ibmhostspath 2009-12-07 13:13:03.000000000 +0100 ++++ x3270-3.3.10ga4/c3270-3.3/host.c 2009-12-07 13:14:35.000000000 +0100 +@@ -126,7 +126,7 @@ hostfile_init(void) + hostfile_initted = True; + hostfile_name = appres.hostsfile; + if (hostfile_name == CN) +- hostfile_name = xs_buffer("%s/ibm_hosts", appres.conf_dir); ++ hostfile_name = xs_buffer("%s/ibm_hosts", "/etc"); + else + hostfile_name = do_subst(appres.hostsfile, True, True); + hf = fopen(hostfile_name, "r"); +diff -up x3270-3.3.10ga4/c3270-3.3/html/c3270-man.html.ibmhostspath x3270-3.3.10ga4/c3270-3.3/html/c3270-man.html +diff -up x3270-3.3.10ga4/c3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/c3270-3.3/html/Resources.html +diff -up x3270-3.3.10ga4/c3270-3.3/Makefile.ibmhostspath x3270-3.3.10ga4/c3270-3.3/Makefile +diff -up x3270-3.3.10ga4/c3270-3.3/Makefile.in.ibmhostspath x3270-3.3.10ga4/c3270-3.3/Makefile.in +--- x3270-3.3.10ga4/c3270-3.3/Makefile.in.ibmhostspath 2009-12-07 13:06:43.000000000 +0100 ++++ x3270-3.3.10ga4/c3270-3.3/Makefile.in 2009-12-07 13:12:43.000000000 +0100 +@@ -84,10 +84,10 @@ install:: c3270 x3270if + $(INSTALL_PROGRAM) c3270 $(DESTDIR)$(BINDIR)/c3270 + $(INSTALL_PROGRAM) x3270if $(DESTDIR)$(BINDIR)/x3270if + install:: +- [ -d $(DESTDIR)$(LIBX3270DIR) ] || \ +- mkdir -p $(DESTDIR)$(LIBX3270DIR) +- [ -r $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ] || \ +- $(INSTALL_DATA) ibm_hosts $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ++ [ -d $(DESTDIR)/etc ] || \ ++ mkdir -p $(DESTDIR)/etc ++ [ -r $(DESTDIR)/etc/ibm_hosts ] || \ ++ $(INSTALL_DATA) ibm_hosts $(DESTDIR)/etc/ibm_hosts + @PR@install:: + + install.man: +diff -up x3270-3.3.10ga4/s3270-3.3/host.c.ibmhostspath x3270-3.3.10ga4/s3270-3.3/host.c +--- x3270-3.3.10ga4/s3270-3.3/host.c.ibmhostspath 2009-12-07 13:17:07.000000000 +0100 ++++ x3270-3.3.10ga4/s3270-3.3/host.c 2009-12-07 13:18:19.000000000 +0100 +@@ -126,7 +126,7 @@ hostfile_init(void) + hostfile_initted = True; + hostfile_name = appres.hostsfile; + if (hostfile_name == CN) +- hostfile_name = xs_buffer("%s/ibm_hosts", appres.conf_dir); ++ hostfile_name = xs_buffer("%s/ibm_hosts", "/etc"); + else + hostfile_name = do_subst(appres.hostsfile, True, True); + hf = fopen(hostfile_name, "r"); +diff -up x3270-3.3.10ga4/s3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/s3270-3.3/html/Resources.html +diff -up x3270-3.3.10ga4/s3270-3.3/html/s3270-man.html.ibmhostspath x3270-3.3.10ga4/s3270-3.3/html/s3270-man.html +diff -up x3270-3.3.10ga4/s3270-3.3/s3270.man.ibmhostspath x3270-3.3.10ga4/s3270-3.3/s3270.man +--- x3270-3.3.10ga4/s3270-3.3/s3270.man.ibmhostspath 2009-12-07 13:16:49.000000000 +0100 ++++ x3270-3.3.10ga4/s3270-3.3/s3270.man 2009-12-07 13:18:34.000000000 +0100 +@@ -2015,7 +2015,7 @@ the \fBtraceDir\fP resource. + If more than one \fB\-xrm\fP option is given for the same resource, + the last one on the command line is used. + .SH "FILES" +-/usr/local/lib/x3270/ibm_hosts ++/etc/ibm_hosts + .br + + .SH "SEE ALSO" +diff -up x3270-3.3.10ga4/s3270-3.3/X3270.xad.ibmhostspath x3270-3.3.10ga4/s3270-3.3/X3270.xad +--- x3270-3.3.10ga4/s3270-3.3/X3270.xad.ibmhostspath 2009-12-07 13:17:00.000000000 +0100 ++++ x3270-3.3.10ga4/s3270-3.3/X3270.xad 2009-12-07 13:18:45.000000000 +0100 +@@ -221,7 +221,7 @@ x3270.charsetList: U.S. English (CP 03 + ! x3270.doConfirms: true + ! x3270.debugTracing: true + ! x3270.disconnectClear: false +-! x3270.hostsFile: /usr/lib/X11/x3270/ibm_hosts ++! x3270.hostsFile: /etc/ibm_hosts + ! x3270.highlightSelect: true + ! x3270.idleCommand: + ! x3270.idleTimeout: ~7m +diff -up x3270-3.3.10ga4/x3270-3.3/html/ibm_hosts.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/ibm_hosts.html +diff -up x3270-3.3.10ga4/x3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/Resources.html +diff -up x3270-3.3.10ga4/x3270-3.3/html/x3270-man.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/x3270-man.html +diff -up x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man.ibmhostspath x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man +--- x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man.ibmhostspath 2009-12-07 12:59:42.000000000 +0100 ++++ x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man 2009-12-07 13:01:03.000000000 +0100 +@@ -3,7 +3,7 @@ + .SH "NAME" + ibm_hosts \- host database for x3270 and c3270 + .SH "SYNOPSIS" +-/usr/lib/X11/x3270/ibm_hosts ++/etc/ibm_hosts + .SH "DESCRIPTION" + The \fBibm_hosts\fP + file contains information regarding IBM hosts on the network. +@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 em + enter the string `3' on the second data-entry field on the screen, and + send the Enter \s-1AID\s+1 sequence. + .SH "FILES" +-/usr/lib/X11/x3270/ibm_hosts ++/etc/ibm_hosts + .SH "SEE ALSO" + x3270(1), + c3270(1) +diff -up x3270-3.3.10ga4/x3270-3.3/Imakefile.in.ibmhostspath x3270-3.3.10ga4/x3270-3.3/Imakefile.in +--- x3270-3.3.10ga4/x3270-3.3/Imakefile.in.ibmhostspath 2009-12-07 12:57:19.000000000 +0100 ++++ x3270-3.3.10ga4/x3270-3.3/Imakefile.in 2009-12-07 13:03:46.000000000 +0100 +@@ -190,8 +190,8 @@ $(DESTDIR)$(FONTINSTDIR)/fonts.dir:: + /* Extra install rule for the sample ibm_hosts file (runs only if there is + no ibm_hosts file installed yet). */ + install:: $(HOSTSFILE) +- @[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \ +- $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ++ @[ -r $(DESTDIR)/etc/$(HOSTSFILE) ] || \ ++ $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)/etc/$(HOSTSFILE) + + /* + * Install rules for x3270if, x3270-script and ibm_hosts man pages. +@@ -220,8 +220,8 @@ install.byprefix:: + $(MKFONTDIR) $(DESTDIR)$(autoconf_fontinstdir) + chmod u=rwx,go=rx $(DESTDIR)$(autoconf_fontinstdir) + chmod a=r $(DESTDIR)$(autoconf_fontinstdir)/fonts.dir +- @[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \ +- (set -x; $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE)) ++ @[ -r $(DESTDIR)/etc/$(HOSTSFILE) ] || \ ++ (set -x; $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)/etc/$(HOSTSFILE)) + + /****************************************************************************** + * Clean rules. * +diff -up x3270-3.3.10ga4/x3270-3.3/Makefile.in.ibmhostspath x3270-3.3.10ga4/x3270-3.3/Makefile.in +--- x3270-3.3.10ga4/x3270-3.3/Makefile.in.ibmhostspath 2009-12-07 12:59:22.000000000 +0100 ++++ x3270-3.3.10ga4/x3270-3.3/Makefile.in 2009-12-07 13:16:01.000000000 +0100 +@@ -127,10 +127,10 @@ install:: x3270 x3270if + $(INSTALL_PROGRAM) x3270 $(DESTDIR)$(BINDIR)/x3270 + $(INSTALL_PROGRAM) x3270if $(DESTDIR)$(BINDIR)/x3270if + install:: +- [ -d $(DESTDIR)$(LIBX3270DIR) ] || \ +- mkdir -p $(DESTDIR)$(LIBX3270DIR) +- [ -r $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ] || \ +- $(INSTALL_DATA) ibm_hosts $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ++ [ -d $(DESTDIR)/etc ] || \ ++ mkdir -p $(DESTDIR)/etc ++ [ -r $(DESTDIR)/etc/ibm_hosts ] || \ ++ $(INSTALL_DATA) ibm_hosts $(DESTDIR)/etc/ibm_hosts + install:: + [ -d $(DESTDIR)$(CIFONTDIR) ] || \ + mkdir -p $(DESTDIR)$(CIFONTDIR) +diff -up x3270-3.3.10ga4/x3270-3.3/X3270.ad.ibmhostspath x3270-3.3.10ga4/x3270-3.3/X3270.ad +--- x3270-3.3.10ga4/x3270-3.3/X3270.xad.ibmhostspath 2009-12-07 12:59:53.000000000 +0100 ++++ x3270-3.3.10ga4/x3270-3.3/X3270.xad 2009-12-07 13:05:28.000000000 +0100 +@@ -214,7 +214,7 @@ x3270.charsetList: U.S. English (CP 03 + ! x3270.doConfirms: true + ! x3270.debugTracing: true + ! x3270.disconnectClear: false +-! x3270.hostsFile: /usr/lib/X11/x3270/ibm_hosts ++! x3270.hostsFile: /etc/ibm_hosts + ! x3270.highlightSelect: true + ! x3270.idleCommand: + ! x3270.idleTimeout: ~7m +diff -up x3270-3.3.10ga4/x3270-3.3/x3270.man.ibmhostspath x3270-3.3.10ga4/x3270-3.3/x3270.man +--- x3270-3.3.10ga4/x3270-3.3/x3270.man.ibmhostspath 2009-12-07 12:59:05.000000000 +0100 ++++ x3270-3.3.10ga4/x3270-3.3/x3270.man 2009-12-07 13:05:42.000000000 +0100 +@@ -5008,7 +5008,7 @@ T} + The special types \fBsocks4a\fP and \fBsocks5d\fP can also be used to force + the proxy server to do the hostname resolution for the SOCKS protocol. + .SH "FILES" +-/usr/lib/X11/x3270/ibm_hosts ++/etc/ibm_hosts + .br + $HOME/.x3270pro + diff --git a/x3270-3.3.10-paths.patch b/x3270-3.3.10-paths.patch new file mode 100644 index 0000000..e3e9a3a --- /dev/null +++ b/x3270-3.3.10-paths.patch @@ -0,0 +1,18 @@ +diff -up x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect.expectpath x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect +--- x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect.expectpath 2009-12-04 13:56:39.000000000 +0100 ++++ x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect 2009-12-04 13:56:44.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/expect ++#! /usr/bin/expect + # TSO login script, which runs as a peer of x3270. + # expect version + +diff -up x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash.bashpath x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash +--- x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash.bashpath 2009-12-04 13:58:21.000000000 +0100 ++++ x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash 2009-12-04 13:59:25.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/bash ++#! /bin/bash + + # Copyright (c) 1995-2009, Paul Mattes. + # All rights reserved. diff --git a/x3270-3.3.4-path.patch b/x3270-3.3.4-path.patch deleted file mode 100644 index 92c90a4..0000000 --- a/x3270-3.3.4-path.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urN x3270-3.3/Examples/cms_logon.bash x3270-3.3_new/Examples/cms_logon.bash ---- x3270-3.3/Examples/cms_logon.bash 2002-12-06 20:54:07.000000000 +0100 -+++ x3270-3.3_new/Examples/cms_logon.bash 2006-07-05 10:59:04.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/bash -+#! /bin/bash - - # Copyright 1995, 2000, 2002 by Paul Mattes. - # Permission to use, copy, modify, and distribute this software and its -diff -urN x3270-3.3/Examples/peer_script.expect x3270-3.3_new/Examples/peer_script.expect ---- x3270-3.3/Examples/peer_script.expect 2002-12-06 20:54:07.000000000 +0100 -+++ x3270-3.3_new/Examples/peer_script.expect 2006-07-05 10:59:25.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/expect -+#! /usr/bin/expect - # TSO login script, which runs as a peer of x3270. - # expect version - diff --git a/x3270-3.3.6-redhat.patch b/x3270-3.3.6-redhat.patch deleted file mode 100644 index 5726a2f..0000000 --- a/x3270-3.3.6-redhat.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up x3270-3.3/Examples/cms_logon.bash.rh x3270-3.3/Examples/cms_logon.bash ---- x3270-3.3/Examples/cms_logon.bash.rh 2008-10-02 14:19:49.000000000 +0200 -+++ x3270-3.3/Examples/cms_logon.bash 2008-10-02 14:20:05.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/bash -+#! /bin/bash - - # Copyright 1995, 2000, 2002 by Paul Mattes. - # Permission to use, copy, modify, and distribute this software and its -diff -up x3270-3.3/Examples/peer_script.expect.rh x3270-3.3/Examples/peer_script.expect ---- x3270-3.3/Examples/peer_script.expect.rh 2008-10-02 14:20:28.000000000 +0200 -+++ x3270-3.3/Examples/peer_script.expect 2008-10-02 14:20:40.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/expect -+#! /usr/bin/expect - # TSO login script, which runs as a peer of x3270. - # expect version - diff --git a/x3270-3.3.6-resize.patch b/x3270-3.3.6-resize.patch deleted file mode 100644 index f83d49d..0000000 --- a/x3270-3.3.6-resize.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- x3270-3.3/screen.c.old 2007-07-18 08:58:54.000000000 +0100 -+++ x3270-3.3/screen.c 2007-07-18 08:59:07.000000000 +0100 -@@ -5072,7 +5072,6 @@ - trace_event(" bigger\n asserting desired size\n"); - set_toplevel_sizes(); - screen_redo = REDO_NONE; -- goto done; - } - - /* They're not correct. */ diff --git a/x3270.spec b/x3270.spec index 1440425..020c79e 100644 --- a/x3270.spec +++ b/x3270.spec @@ -5,22 +5,22 @@ %define desktop_file_utils_version 0.2.93 %endif +%define majorver 3.3 Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 3.3.6 -Release: 10%{?dist} +Version: 3.3.10ga4 +Release: 1%{?dist} License: MIT Group: Applications/Internet -URL: http://www.geocities.com/SiliconValley/Peaks/7814 -Source0: http://x3270.bgp.nu/download/x3270-%{version}.tgz -Source1: http://x3270.bgp.nu/download/c3270-%{version}.tgz -Source2: x3270.png -Source3: x3270.desktop -Patch0: x3270-3.3.6-redhat.patch -Patch1: c3270-332-ncursesw.patch -Patch2: x3270-3.3-syntax.patch -Patch3: x3270-3.3-encoding.patch -Patch4: x3270-3.3.6-resize.patch +URL: http://x3270.sourceforge.net/ +Source0: http://downloads.sourceforge.net/project/x3270/x3270/3.3.10ga4/suite3270-%{version}-src.tgz +# c3270-3.3 pr3287-3.3 s3270-3.3 tcl3270-3.3 wc3270-3.3 wpr3287-3.3 ws3270-3.3 x3270-3.3 +# +Source1: x3270.png +Source2: x3270.desktop +Patch0: x3270-3.3.10-paths.patch +Patch1: x3270-3.3.10-ibmhostpath.patch + Prereq: xorg-x11-font-utils BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,64 +72,75 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM 3278/3279 terminal emulator without running X. %prep -%setup -q -n x3270-3.3 -a 1 +rm -rf x3270-%{version} +mkdir x3270-%{version} +tar -xz -C x3270-%{version} -f %{SOURCE0} +cd x3270-%{version} +# delete windows and tcl sources: +rm -rf wpr3287* wc3270* ws3270* tcl3270* %patch0 -p1 %patch1 -p1 -%patch2 -p1 -#patch3 -p1 -%patch4 -p1 %build -# Set LIBX3270DIR to something we can share with x3270-text -perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" Imakefile.in -# use rpmoptflags for x3270if -perl -pi -e 's/ -o x3270if x3270if.c/ \$(CCOPTIONS) -o x3270if x3270if.c/g' Imakefile.in +cd x3270-%{version} # Fix end of line encodings -perl -pi -e "s/ //" html/Keymap.html html/Build.html -libtoolize --copy --force -%configure --prefix=%{_prefix}/ --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults -xmkmf -make Makefiles -make includes -make depend +perl -pi -e "s/ //" */html/Keymap.html */html/Build.html +# Set LIBX3270DIR to something we can share with x3270-text +perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" x3270-%{majorver}/Imakefile.in +# use rpmoptflags for x3270if +perl -pi -e 's/ -o x3270if x3270if.c/ \$(CCOPTIONS) -o x3270if x3270if.c/g' x3270-%{majorver}/Imakefile.in +for i in x3270-%{majorver} c3270-%{majorver} pr3287-%{majorver} s3270-%{majorver}; do +( cd $i +%configure --prefix=%{_prefix}/ --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS" -cd c3270-3.3 -autoconf -libtoolize --copy --force -%configure --prefix=%{_prefix} -make %{?_smp_mflags} +) +done %install +cd x3270-%{version} rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/x3270 mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin mkdir -p $RPM_BUILD_ROOT%{_datadir}/x3270 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p ${RPM_BUILD_ROOT}%{fontdir} mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults mkdir -p ${RPM_BUILD_ROOT}%{catalogue} -# XXX Hack around mkfontdir madness on install. -install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/bin -install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin -install -m644 *pcf.gz $RPM_BUILD_ROOT%{fontdir} -install -m644 ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/ -install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin -install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x -cd c3270-3.3 -install -m755 c3270 $RPM_BUILD_ROOT%{_prefix}/bin -for i in c3270 x3270if x3270-script ibm_hosts; do - install -m644 $i.man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 -done -cd .. +install -m755 x3270-%{majorver}/x3270 $RPM_BUILD_ROOT%{_prefix}/bin +install -m755 x3270-%{majorver}/x3270if $RPM_BUILD_ROOT%{_prefix}/bin +install -m644 x3270-%{majorver}/*pcf.gz $RPM_BUILD_ROOT%{fontdir} +install -m644 x3270-%{majorver}/ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/ +install -m644 x3270-%{majorver}/X3270.xad ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/X3270 +install -m644 x3270-%{majorver}/x3270.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270.1 +install -m644 x3270-%{majorver}/x3270if.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270if.1 +install -m644 x3270-%{majorver}/x3270-script.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270-script.1 +install -m644 x3270-%{majorver}/ibm_hosts.man $RPM_BUILD_ROOT%{_mandir}/man5/ibm_hosts.5 -install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps +install -m755 pr3287-%{majorver}/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin +install -m644 pr3287-%{majorver}/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x + +install -m755 c3270-%{majorver}/c3270 $RPM_BUILD_ROOT%{_prefix}/bin +install -m644 c3270-%{majorver}/c3270.man $RPM_BUILD_ROOT%{_mandir}/man1/c3270.1 + +install -m755 s3270-%{majorver}/s3270 $RPM_BUILD_ROOT%{_prefix}/bin +install -m644 s3270-%{majorver}/s3270.man $RPM_BUILD_ROOT%{_mandir}/man1/s3270.1 + +install -m644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities -install -m644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities -install -m644 X3270.xad ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/X3270 +install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/x3270 +mv x3270-%{majorver}/README* x3270-%{majorver}/LICENSE x3270-%{majorver}/Examples x3270-%{majorver}/html . +#mv c3270-%{majorver}/Examples/* Examples +mv c3270-%{majorver}/README README.c3270 +mv c3270-%{majorver}/html html_c3270 +mv pr3287-%{majorver}/README README.pr3287 +mv pr3287-%{majorver}/html html_pr3287 +mv s3270-%{majorver}/README README.s3270 +mv s3270-%{majorver}/html html_s3270 %if %{desktop_file} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications @@ -143,8 +154,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk %endif -rm -f Examples/*.rh Examples/*.orig -chmod -x Examples/* html/* +rm -f */Examples/*.rh */Examples/*.orig +chmod -x Examples/* html*/* %clean rm -rf $RPM_BUILD_ROOT @@ -167,11 +178,13 @@ fi %files %defattr(-,root,root) -%doc README LICENSE Examples html +%doc %{name}-%{version}/{README*,LICENSE,Examples,html*} +%{_prefix}/bin/s3270 %{_prefix}/bin/pr3287 %{_prefix}/bin/x3270if %exclude %{_mandir}/man1/c3270* %{_mandir}/man1/* +%{_mandir}/man5/* %dir %{_datadir}/x3270 %config(noreplace) %{_sysconfdir}/ibm_hosts @@ -195,6 +208,9 @@ fi %{_mandir}/man1/c3270* %changelog +* Tue Dec 08 2009 Karsten Hopp 3.3.10ga4-1 +- update to 3.3.10ga4-1 + * Fri Aug 21 2009 Tomas Mraz - 3.3.6-10 - rebuilt with new openssl