![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package x3270 for openSUSE:Factory checked in at 2015-09-24 06:14:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/x3270 (Old)
and /work/SRC/openSUSE:Factory/.x3270.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "x3270"
Changes:
--------
--- /work/SRC/openSUSE:Factory/x3270/x3270.changes 2015-04-27 13:05:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.x3270.new/x3270.changes 2015-09-24 06:14:32.000000000 +0200
@@ -1,0 +2,94 @@
+Mon Sep 7 12:09:58 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 3.4:
+ * Recreated tarball and build approach so adapt our system
+ * Fixed a number of warnings found by the MacOS C compiler, which turned out
+ to be real issues.
+ * [all] Synchronize the ReadBuffer action with the Wait(Output) action, just
+ like Ascii and Ebcdic.
+ * [all] Fixed an NVT-mode emulation problem.
+ * [all] Fixed a synchronization issue with scripts and file transfers.
+ * [c3270, wc3270] Fixed a crash when the Transfer action was called from a
+ script.
+ * [x3270] Fixed a crash when visible control characters are turned on in
+ 3278 mode.
+ * [pr3287] Changed the pr3287 Makefile to use $INSTALL_DATA (bugs:#13).
+ * [All Unix] Added -D_DEFAULT_SOURCE wherever a Makefile used -D_BSD_SOURCE,
+ to get rid of compiler warnings with newer versions of glibc (bugs:#12).
+ * [x3270, c3270, wc3270] Corrected the OIA display of save-to-printer pages.
+ * [c3270, wc3270] Made the help for file-transfer reflect the current
+ defaults. Added help for Keymap.
+ * [wc3270] Fixed the pager at the wc3270> prompt. Now it adapts to the size
+ of the console window correctly.
+ * [pr3287, wpr3287] Fixed a problem with printer session start-up when both
+ a specific printer LU and an SSL tunnel (L:) are specified.
+ * [c3270, wc3270] Added a Keymap action to add or remove temporary keymaps.
+ The semantics are the same as the x3270 action of the same name.
+ * [all] Made the parameter to ResumeScript optional, and relaxed the
+ restrictions on when PauseScript can be used, so it can now be used from
+ macros and command files read with the Source action.
+ * [c3270, wc3270] Allow the DFT buffer size to be changed in the c3270/wc3270
+ file transfer dialog.
+ * [c3270, wc3270] Allow file transfers to be interrupted with Ctrl-C.
+ * [x3270] Fixed an issue where the terminal type would not be reported to the
+ host as IBM-DYNAMIC if the screen was put into oversize mode via a menu
+ selection (it was correct if oversize came from a resource). Also made sure
+ that the 'About->Configuration' display of the terminal type is always
+ correct.
+ * [all] Added resources to define the default values for each of the IND$FILE
+ file transfer parameters. The resources have the same names as the Transfer
+ action keywords, with ft prepended. E.g., the Mode default is controlled by
+ the ftMode resource. For consistency, deprecated dftBufferSize and
+ ftCodePage in favor of ftBufferSize and ftWindowsCodePage (the old
+ resources are still available).
+ * [all] Added missing functionality to specify the size for avblock TSO file
+ allocations in IND$FILE file transfers.
+ * [x3270] Added an aplCircledAlpha resource to allow x3270 to properly
+ display APL underscored uppercase letters with the APL385 font, by
+ translating them to the (nonstandard) Unicode circled-alphabetic range
+ U+24B6 to U+25CF.
+ * [x3270, c3270, wc3270] Overhauled visible control characters so that field
+ attributes are completely decoded. Field attributes are now in underlined
+ yellow in x3270. Added visible control character support to c3270 (also
+ underlined yellow) and wc3270 (reverse-video yellow), with a menu option.
+ * [all] Overhauled the build structure. Now there are libraries for common
+ functions.
+ * [wc3270] Mapped Alt-left-click onto a lightpen select operation. Added a
+ lightPenPrimary resource to switch this, so that an unmodified left-click
+ is a lightpen select and Alt-left-click is a cursor move or copy/paste
+ highlight.
+ * [all] Added a B: prefix option to hostnames to disable the automatic
+ keyboard unlock when a BIND-IMAGE is received.
+ * [all] Added an -nvt option and an nvtMode resource to force NVT mode as
+ soon as a session is connected. This overrides the usual behavior of
+ locking the keyboard and waiting for the host to send NVT-mode data or
+ negotiate 3270 mode before unlocking. This option also changes the default
+ terminal type to xterm.
+ * [c3270] Added a mapping from the Escape key to the Escape() action
+ (breaking to the c3270> prompt).
+ * [x3270] Added a maxRecent resource to control the maximum size of the
+ recent host list in the Connect menu.
+ * [all] Allow the -scriptport option to specify an address to listen on.
+ * [all] Added webserver support. The -httpd option starts a webserver
+ listening on the specified port. The webserver supports a REST API and
+ some basic HTML objects.
+ * [all] Removed configurability of tracing, NVT mode, TN3270E support,
+ scripting, menus file transfer, the x3270 pop-up keypad and printer
+ sessions (they're always enabled now).
+ * [x3270, wc3270] Added an overlayPaste toggle. When set, pasting over a
+ protected field will simply increment the cursor position instead of
+ locking the keyboard. This allows forms to be copied and pasted with the
+ protected fields included. Setting this toggle also implicitly sets the
+ marginedPaste toggle.
+ * [x3270] Changed the selection logic so that a rectangular selection
+ (the default for 3270 mode) never ends with a newline character.
+- Refresh patches:
+ * mknod.patch
+ * pr3270-memleak.patch
+ * usr_local_bin.patch
+- Add new patch to fix missing include:
+ * x3270-missing-include.patch
+- Add new patch to fix missed file from tarball, taken from older version:
+ * x3270-missing-file.patch
+
+-------------------------------------------------------------------
Old:
----
suite3270-3.3.15ga8-src.tgz
New:
----
suite3270-3.4ga7-src.tgz
x3270-missing-file.patch
x3270-missing-include.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x3270.spec ++++++
--- /var/tmp/diff_new_pack.VIMJUh/_old 2015-09-24 06:14:33.000000000 +0200
+++ /var/tmp/diff_new_pack.VIMJUh/_new 2015-09-24 06:14:33.000000000 +0200
@@ -16,11 +16,11 @@
#
-%define _suffix ga8
+%define _suffix ga7
%define _fullname suite3270-%{version}%{_suffix}
%define _x026ver 1.2
Name: x3270
-Version: 3.3.15
+Version: 3.4
Release: 0
Summary: A Family of IBM 3270 Terminal Emulators
License: MIT
@@ -32,6 +32,8 @@
Patch100: usr_local_bin.patch
Patch102: x026-offset.diff
Patch104: pr3270-memleak.patch
+Patch105: x3270-missing-include.patch
+Patch106: x3270-missing-file.patch
BuildRequires: bdftopcf
BuildRequires: fdupes
BuildRequires: fontpackages-devel
@@ -94,57 +96,33 @@
# will also hold the common config.cache
# -q uietly -c reate -name all3270
# -a fter changing into all3270, expand sources
-%setup -q -c -n all3270 -T -a0 -a1
+%setup -q -n suite3270-%{version} -a1
%patch0
%patch100
%patch102
%patch104
+%patch105 -p1
+%patch106 -p1
%build
export CFLAGS="%{optflags}"
export LIBX3270DIR=%{_sysconfdir}/x3270
-# the tcl variant
-cd tcl3270-3.3
- %configure \
- --cache-file=../config.cache \
- --enable-ssl
- make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR}
-cd ..
-# the X variant
-cd x3270-3.3
- %configure \
- --cache-file=../config.cache \
+%configure \
+ --disable-windows \
+ --disable-windows-lib \
+ --enable-lib \
+ --enable-unix \
+ --enable-ssl \
--enable-app-defaults \
--x-includes=%{_includedir} \
--x-libraries=%{_libdir} \
--with-all-xinstall \
- --with-fontdir=%{_miscfontsdir} \
- --enable-ssl
- xmkmf -a
- make depend
- make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR}
-cd ..
-# the console variant
-cd c3270-3.3
- %configure \
- --cache-file=../config.cache \
- --enable-ssl
- make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR}
-cd ..
-# the scripting variant
-cd s3270-3.3
- %configure \
- --cache-file=../config.cache \
- --enable-ssl
- make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR}
-cd ..
-# the printer
-cd pr3287-3.3
- %configure \
- --cache-file=../config.cache \
- --enable-ssl
- make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR}
-cd ..
+ --with-iconv \
+ --with-fontdir=%{_miscfontsdir}
+# There is broken generated makefile
+sed -i -e 's:$(FALLBACKS_:$(FALLBACKS):g' x3270/Makefile
+make depend
+make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} unix
# the IBM 026 keypunch emulator
cd x026-%{_x026ver}
xmkmf
@@ -155,45 +133,13 @@
export LIBX3270DIR=%{_sysconfdir}/x3270
# create the default directory structure in the build root
mkdir --parents %{buildroot}{%{_bindir},%{_mandir}/{man1,man5}}
-# the X variant
-cd x3270-3.3
- chmod -x html/Keymap.html
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
- # make install does a mkfontdir, that creates a fonts.dir we don't
- # want in the package. remove that:
- rm %{buildroot}%{_miscfontsdir}/fonts.dir
- install -d -m 755 \
- %{buildroot}%{_datadir}/X11/app-defaults
- install -m 644 X3270.xad \
- %{buildroot}%{_datadir}/X11/app-defaults/X3270
- # clean up:
- # remove remainders of patching the examples, if existing
- rm -v Examples/*.orig || true
-cd ..
-# the console variant
-cd c3270-3.3
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
-cd ..
-# the scripting variant
-cd s3270-3.3
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
-cd ..
-# the tcl variant
-cd tcl3270-3.3
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
-cd ..
-# the printer
-cd pr3287-3.3
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
- make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
-cd ..
+chmod -x x3270/html/Keymap.html
+chmod -x s3270/Examples/cms_cmd.expect
+make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
+make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
# the IBM 026 keypunch emulator
cd x026-%{_x026ver}
-make DESTDIR=%{buildroot} install install.man
+ make DESTDIR=%{buildroot} install install.man
cd ..
# move site config files to the standard locations
mkdir -p %{buildroot}%{_libexecdir}/x3270
@@ -201,17 +147,25 @@
chmod 644 %{buildroot}%{_sysconfdir}/x3270/ibm_hosts
# set permissions correct
chmod ugo-x %{buildroot}%{_mandir}/man{1,5}/*
+# make install does a mkfontdir, that creates a fonts.dir we don't
+# want in the package. remove that:
+rm %{buildroot}%{_miscfontsdir}/fonts.dir
+install -d -m 755 \
+ %{buildroot}%{_datadir}/X11/app-defaults
+install -m 644 x3270/X3270.ad \
+ %{buildroot}%{_datadir}/X11/app-defaults/X3270
# copy the docs
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -pr --parents Playback %{buildroot}%{_docdir}/%{name}
-cp -pr --parents x3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name}
-cp -pr --parents c3270-3.3/html %{buildroot}%{_docdir}/%{name}
-cp -pr --parents pr3287-3.3/html %{buildroot}%{_docdir}/%{name}
-cp -pr --parents s3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name}
-cp -pr --parents tcl3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name}
+cp -pr --parents x3270/{Examples,html} %{buildroot}%{_docdir}/%{name}
+cp -pr --parents c3270/html %{buildroot}%{_docdir}/%{name}
+cp -pr --parents pr3287/html %{buildroot}%{_docdir}/%{name}
+cp -pr --parents s3270/{Examples,html} %{buildroot}%{_docdir}/%{name}
+cp -pr --parents tcl3270/{Examples,html} %{buildroot}%{_docdir}/%{name}
# create symlinks in documentation
%fdupes -s %{buildroot}/%{_docdir}
+
%{reconfigure_fonts_scriptlets}
%files
@@ -232,27 +186,27 @@
%dir %{_miscfontsdir}
%{_miscfontsdir}/*
%doc %{_mandir}/man1/x3270.1x.gz
-%doc %{_docdir}/%{name}/x3270-3.3/Examples
-%doc %{_docdir}/%{name}/x3270-3.3/html
+%doc %{_docdir}/%{name}/x3270/Examples
+%doc %{_docdir}/%{name}/x3270/html
%doc %{_docdir}/%{name}/Playback
# c3270
%{_bindir}/c3270
%doc %{_mandir}/man1/c3270.1.gz
-%doc %{_docdir}/%{name}/c3270-3.3/html
+%doc %{_docdir}/%{name}/c3270/html
# pr3287
%{_bindir}/pr3287
%doc %{_mandir}/man1/pr3287.1.gz
-%doc %{_docdir}/%{name}/pr3287-3.3/html
+%doc %{_docdir}/%{name}/pr3287/html
# s3270
%{_bindir}/s3270
%doc %{_mandir}/man1/s3270.1.gz
-%doc %{_docdir}/%{name}/s3270-3.3/Examples
-%doc %{_docdir}/%{name}/s3270-3.3/html
+%doc %{_docdir}/%{name}/s3270/Examples
+%doc %{_docdir}/%{name}/s3270/html
# tcl3270
%{_bindir}/tcl3270
%doc %{_mandir}/man1/tcl3270.1.gz
-%doc %{_docdir}/%{name}/tcl3270-3.3/Examples
-%doc %{_docdir}/%{name}/tcl3270-3.3/html
+%doc %{_docdir}/%{name}/tcl3270/Examples
+%doc %{_docdir}/%{name}/tcl3270/html
# x026
%{_bindir}/x026
%doc %{_mandir}/man1/x026.1x.gz
++++++ mknod.patch ++++++
--- /var/tmp/diff_new_pack.VIMJUh/_old 2015-09-24 06:14:33.000000000 +0200
+++ /var/tmp/diff_new_pack.VIMJUh/_new 2015-09-24 06:14:33.000000000 +0200
@@ -1,7 +1,7 @@
-Index: x3270-3.3/Examples/peer_script.bash
+Index: x3270/Examples/peer_script.bash
===================================================================
---- x3270-3.3/Examples/peer_script.bash.orig
-+++ x3270-3.3/Examples/peer_script.bash
+--- x3270/Examples/peer_script.bash.orig
++++ x3270/Examples/peer_script.bash
@@ -60,9 +60,9 @@ ip=/tmp/ip.$$
op=/tmp/op.$$
rm -f $ip $op
@@ -15,10 +15,10 @@
# Start x3270
x3270 -script -model 2 <$ip >$op &
-Index: x3270-3.3/Examples/peer_script.sh
+Index: x3270/Examples/peer_script.sh
===================================================================
---- x3270-3.3/Examples/peer_script.sh.orig
-+++ x3270-3.3/Examples/peer_script.sh
+--- x3270/Examples/peer_script.sh.orig
++++ x3270/Examples/peer_script.sh
@@ -59,9 +59,9 @@ ip=/tmp/ip.$$
op=/tmp/op.$$
rm -f $ip $op
++++++ pr3270-memleak.patch ++++++
--- /var/tmp/diff_new_pack.VIMJUh/_old 2015-09-24 06:14:33.000000000 +0200
+++ /var/tmp/diff_new_pack.VIMJUh/_new 2015-09-24 06:14:33.000000000 +0200
@@ -1,19 +1,15 @@
-Index: pr3287-3.3/telnet.c
+Index: pr3287/telnet.c
===================================================================
---- pr3287-3.3/telnet.c.orig
-+++ pr3287-3.3/telnet.c
-@@ -453,8 +453,13 @@ negotiate(const char *host, struct socka
- cstate != CONNECTED_3270 && /* TN3270 */
- cstate != NOT_CONNECTED) { /* gave up */
+--- pr3287/telnet.c.orig
++++ pr3287/telnet.c
+@@ -434,6 +434,10 @@ pr_net_negotiate(const char *host, struc
+ cstate != NOT_CONNECTED) { /* gave up */
-- if (net_input(s) < 0)
-+ if (net_input(s) < 0) {
-+ Free(netrbuf);
-+ Free(ibuf);
-+ netrbuf = NULL;
-+ ibuf = NULL;
- return -1;
-+ }
+ if (!net_input(s)) {
++ Free(netrbuf);
++ Free(ibuf);
++ netrbuf = NULL;
++ ibuf = NULL;
+ return false;
}
-
- /* Success. */
+ }
++++++ suite3270-3.3.15ga8-src.tgz -> suite3270-3.4ga7-src.tgz ++++++
/work/SRC/openSUSE:Factory/x3270/suite3270-3.3.15ga8-src.tgz /work/SRC/openSUSE:Factory/.x3270.new/suite3270-3.4ga7-src.tgz differ: char 5, line 1
++++++ usr_local_bin.patch ++++++
--- /var/tmp/diff_new_pack.VIMJUh/_old 2015-09-24 06:14:33.000000000 +0200
+++ /var/tmp/diff_new_pack.VIMJUh/_new 2015-09-24 06:14:33.000000000 +0200
@@ -1,19 +1,19 @@
GNU binaries live in /bin and /usr/bin in SuSE systems:
-Index: x3270-3.3/Examples/peer_script.expect
+Index: x3270/Examples/peer_script.expect
===================================================================
---- x3270-3.3/Examples/peer_script.expect.orig
-+++ x3270-3.3/Examples/peer_script.expect
+--- x3270/Examples/peer_script.expect.orig
++++ x3270/Examples/peer_script.expect
@@ -1,4 +1,4 @@
-#! /usr/local/bin/expect
+#! /usr/bin/expect
# TSO login script, which runs as a peer of x3270.
# expect version
-Index: x3270-3.3/Examples/cms_logon.bash
+Index: x3270/Examples/cms_logon.bash
===================================================================
---- x3270-3.3/Examples/cms_logon.bash.orig 2009-01-17 16:52:06.000000000 +0100
-+++ x3270-3.3/Examples/cms_logon.bash 2011-09-15 10:00:49.214331232 +0200
+--- x3270/Examples/cms_logon.bash.orig 2009-01-17 16:52:06.000000000 +0100
++++ x3270/Examples/cms_logon.bash 2011-09-15 10:00:49.214331232 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/bin/bash
+#! /usr/bin/bash
@@ -21,8 +21,8 @@
# Copyright (c) 1995-2009, Paul Mattes.
# All rights reserved.
===================================================================
---- tcl3270-3.3/Examples/cms_cmd.tcl3270 2011/09/15 08:15:35 1.1
-+++ tcl3270-3.3/Examples/cms_cmd.tcl3270 2011/09/15 08:15:45
+--- tcl3270/Examples/cms_cmd.tcl3270 2011/09/15 08:15:35 1.1
++++ tcl3270/Examples/cms_cmd.tcl3270 2011/09/15 08:15:45
@@ -1,4 +1,4 @@
-#!tcl3270
+#!/usr/bin/tcl3270
++++++ x3270-missing-file.patch ++++++
Index: suite3270-3.4/x3270/qcpp.c
===================================================================
--- /dev/null
+++ suite3270-3.4/x3270/qcpp.c
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 1997-2009, Paul Mattes.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Paul Mattes nor his contributors may be used
+ * to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY PAUL MATTES "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL PAUL MATTES BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Quick C preprocessor substitute, for converting X3270.ad to X3270.ad.
+ *
+ * Understands a limited subset of #ifdef/#ifndef/#else/#endif syntax, and
+ * understands -Dsym or -Usym, but not -Dsym=xxx.
+ */
+
+#include
participants (1)
-
root@hilbert.suse.de