pool/x3270
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 84559 from Base:System

Browse Source 
Update to version 3.3.12ga7

OBS-URL: https://build.opensuse.org/request/show/84559
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/x3270?expand=0&rev=15
This commit is contained in:
Sascha Peilicke 2011-09-23 08:36:45 +00:00 committed by Git OBS Bridge
commit 5c4b649cdb
11 changed files with 48 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
c3270-334p3.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6876a6c9b4ccc9e4b32e191c3b94540ef42c5c5b6d8f5bcea7b49fcc4c8901f4
size 689540

33
gcc-322.diff
View File

@ -1,33 +0,0 @@
--- x3270-3.3/telnet.c.ORG 2005-06-16 16:32:42.000000000 +0200
+++ x3270-3.3/telnet.c 2005-06-16 17:06:56.988963537 +0200
@@ -431,7 +431,7 @@
if (hp == (struct hostent *) 0) {
haddr.sin.sin_family = AF_INET;
haddr.sin.sin_addr.s_addr = inet_addr(host);
- if (haddr.sin.sin_addr.s_addr == (unsigned long)-1) {
+ if (haddr.sin.sin_addr.s_addr == INADDR_NONE) {
popup_an_error("Unknown host:\n%s",
hostname);
return -1;
--- tcl3270-3.3/telnet.c.ORG 2005-06-16 16:32:42.000000000 +0200
+++ tcl3270-3.3/telnet.c 2005-06-16 17:11:25.798963537 +0200
@@ -431,7 +431,7 @@
if (hp == (struct hostent *) 0) {
haddr.sin.sin_family = AF_INET;
haddr.sin.sin_addr.s_addr = inet_addr(host);
- if (haddr.sin.sin_addr.s_addr == (unsigned long)-1) {
+ if (haddr.sin.sin_addr.s_addr == INADDR_NONE) {
popup_an_error("Unknown host:\n%s",
hostname);
return -1;
--- s3270-3.3/telnet.c.ORG 2005-06-16 17:17:48.000000000 +0200
+++ s3270-3.3/telnet.c 2005-06-16 17:18:18.738963537 +0200
@@ -431,7 +431,7 @@
if (hp == (struct hostent *) 0) {
haddr.sin.sin_family = AF_INET;
haddr.sin.sin_addr.s_addr = inet_addr(host);
- if (haddr.sin.sin_addr.s_addr == (unsigned long)-1) {
+ if (haddr.sin.sin_addr.s_addr == INADDR_NONE) {
popup_an_error("Unknown host:\n%s",
hostname);
return -1;

3
pr3287-334.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1a2267c5fd4719abce434a128a23fe36bf779a8ac548f2ff9501cc55878dc78c
size 109939

3
s3270-334p3.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eccaf42707f128b9318a8e7986d3c33cc93168efa7b68cd5b0d49eda5630ccee
size 542350

3
suite3270-3.3.12ga7-src.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3652bef827e6dc94a278ad0d731dba5f73fb4e1a421da894fd692cc900222f1
size 6651314

3
tcl3270-334p3.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4095a9ce78bed89ca5457d7b5b9e788959feee0ed79fb8e9586e3a80fec6a3e3
size 517398

34
tcl8.4.patch
View File

@ -1,34 +0,0 @@
--- tcl3270-3.3/configure.in
+++ tcl3270-3.3/configure.in
@@ -39,15 +39,16 @@
tclver=$with_tcl, tclver=8.3)
dnl Allow TclX
-AC_ARG_WITH(tclx, [ --with-tclx[=VERSION] Use TclX], , with_tclx=no)
+AC_ARG_WITH(tclx, [ --with-tclx[=VERSION] Use TclX], , with_tclx=no,
+tclxver=$with_tclx, with_tclx=no)
dnl Set up tclvr (tclver without the period, for BSD)
dnl Note that --with-tclx=VERSION overrides --with-tcl=VERSION.
-if test "$with_tclx" = no
-then :
-elif test "$with_tclx" != yes
-then tclver=$with_tclx
-fi
+# if test "$with_tclx" = no
+# then :
+# elif test "$with_tclx" != yes
+# then tclver=$with_tclx
+# fi
tclvr=`echo $tclver | tr -d .`
dnl Checks for header files.
@@ -230,7 +231,7 @@
then AC_ERROR(Can't find TCL library)
fi
if test "$with_tclx" != no
-then AC_CHECK_LIB(tclx$tclver, Tclx_Init, ,
+then AC_CHECK_LIB(tclx$tclxver, Tclx_Init, ,
AC_CHECK_LIB(tclx$tclvr, Tclx_Init, ,AC_ERROR(Can't find TclX library)))
fi
AC_CHECK_LIB(nsl, gethostbyname)

19
usr_local_bin.patch
View File

@ -12,11 +12,20 @@ Index: x3270-3.3/Examples/peer_script.expect
Index: x3270-3.3/Examples/cms_logon.bash
===================================================================
--- x3270-3.3/Examples/cms_logon.bash.orig
+++ x3270-3.3/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
@@ -1,4 +1,4 @@
-#! /usr/local/bin/bash
+#! /bin/bash
+#! /usr/bin/bash
# Copyright 1995, 2000, 2002 by Paul Mattes.
# Permission to use, copy, modify, and distribute this software and its
# 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
@@ -1,4 +1,4 @@
-#!tcl3270
+#!/usr/bin/tcl3270
# Copyright (c) 2000-2009, Paul Mattes.
# All rights reserved.

3
x3270-334p4.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e382d30ba251263a6aaa8b5cd59d590596bf4d752ca6613fbb4550c4690b89d
size 1096806

13
x3270.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Sep 15 08:56:05 UTC 2011 - bg@suse.com
- Update to version 3.3.12ga7
- lots of bug fixes
- for a complete list, see http://x3270.bgp.nu/documentation-relnotes.html
- remove unneeded patches
- tcl8.4.patch
- gcc-322.diff
- use combined tar ball from upstream
- enable SSL feature
-------------------------------------------------------------------
Mon Nov 8 14:13:08 UTC 2010 - coolo@novell.com

42
x3270.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package x3270 (Version 3.2.20)
# spec file for package x3270
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,37 +19,27 @@
Name: x3270
%if %suse_version > 910
BuildRequires: ncurses-devel xorg-x11 xorg-x11-devel
%else
BuildRequires: XFree86 XFree86-devel
%endif
%define fontdir /usr/share/fonts/misc
%define appdefdir /usr/share/X11
%define xbindir /usr/bin
%define xmandir /usr/share/man
%define xincludes /usr/include
%define xlibraries /usr/%{_lib}
BuildRequires: freetype2 tcl-devel
BuildRequires: freetype2 openssl-devel tcl-devel
License: MIT License (or similar)
Group: System/X11/Terminals
AutoReqProv: on
Version: 3.2.20
Version: 3.3.12
Release: 517
Summary: A Family of IBM 3270 Terminal Emulators
Url: http://x3270.bgp.nu
Source0: http://x3270.bgp.nu/download/x3270-334p4.tgz
Source1: http://x3270.bgp.nu/download/s3270-334p3.tgz
Source2: http://x3270.bgp.nu/download/tcl3270-334p3.tgz
Source3: http://x3270.bgp.nu/download/pr3287-334.tgz
Source4: http://x3270.bgp.nu/download/c3270-334p3.tgz
Source0: suite3270-3.3.12ga7-src.tgz
Source5: README.SuSE
Source6: http://x3270.bgp.nu/download/x026-1.0.tgz
Patch: mknod.patch
Patch100: usr_local_bin.patch
Patch101: tcl8.4.patch
Patch102: x026-offset.diff
Patch103: gcc-322.diff
Patch104: pr3270-memleak.patch
Patch105: gcc4.diff
Group: System/X11/Terminals
@ -101,12 +91,10 @@ x026 is a fun toy which emulates an x026 puncher.
# 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 -a2 -a3 -a4 -a6
%setup -q -c -n all3270 -T -a0 -a6
%patch
%patch100
%patch101
%patch102
%patch103
%patch104
%patch105
@ -122,7 +110,8 @@ cd tcl3270-3.3
--bindir=%{_bindir} \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--with-tcl=%tcl_version
--with-tcl=%tcl_version \
--enable-ssl
make LIBX3270DIR=${LIBX3270DIR}
cd ..
# the X variant
@ -138,7 +127,8 @@ cd x3270-3.3
--x-libraries=%{xlibraries} \
--mandir=%{xmandir} \
--with-all-xinstall \
--with-fontdir=%{fontdir}
--with-fontdir=%{fontdir} \
--enable-ssl
xmkmf -a
make depend
make LIBX3270DIR=${LIBX3270DIR}
@ -151,7 +141,8 @@ cd c3270-3.3
--bindir=%{_bindir} \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--without-pr3287
--without-pr3287 \
--enable-ssl
make LIBX3270DIR=${LIBX3270DIR}
cd ..
# the scripting variant
@ -161,7 +152,8 @@ cd s3270-3.3
--cache-file=../config.cache \
--bindir=%{_bindir} \
--prefix=%{_prefix} \
--mandir=%{_mandir}
--mandir=%{_mandir} \
--enable-ssl
make LIBX3270DIR=${LIBX3270DIR}
cd ..
# the printer
@ -171,7 +163,8 @@ cd pr3287-3.3
--cache-file=../config.cache \
--bindir=%{_bindir} \
--prefix=%{_prefix} \
--mandir=%{_mandir}
--mandir=%{_mandir} \
--enable-ssl
make LIBX3270DIR=${LIBX3270DIR}
cd ..
# the IBM 026 keypunch emulator
@ -190,6 +183,7 @@ ${RPM_BUILD_ROOT:+rm -rf $RPM_BUILD_ROOT}
mkdir --parents $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/{man1,man5}}
# the X variant
cd x3270-3.3
chmod -x html/Keymap.html
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install.man
# make install does a mkfontdir, that creates a fonts.dir we don't
@ -257,7 +251,7 @@ chmod ugo-x $RPM_BUILD_ROOT/usr/share/man/man{1,5}/*
/usr/bin/x3270if
# x3270
%{xbindir}/x3270
%config %{appdefdir}/app-defaults/X3270
%{appdefdir}/app-defaults/X3270
%dir %{fontdir}
%{fontdir}/*
%doc %{xmandir}/man1/x3270.1x.gz