From 884a97c9f0b423e7d1a298fc97bea698f7f899b68320859dee56321a3aae4f6d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 15:07:39 +0000 Subject: [PATCH] Accepting request 24468 from Base:System Copy from Base:System/x3270 based on submit request 24468 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/24468 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/x3270?expand=0&rev=8 --- mknod.patch | 22 ++++--- pr3270-memleak.patch | 6 +- usr_local_bin.patch | 14 ++-- x3270.changes | 5 ++ x3270.spec | 148 ++----------------------------------------- 5 files changed, 34 insertions(+), 161 deletions(-) diff --git a/mknod.patch b/mknod.patch index 271efce..a1a8362 100644 --- a/mknod.patch +++ b/mknod.patch @@ -1,7 +1,8 @@ ---- x3270-3.3/Examples/peer_script.bash -+++ x3270-3.3/Examples/peer_script.bash 2000/06/07 07:37:48 -@@ -59,10 +59,10 @@ - ip=/tmp/ip.$$ +Index: x3270-3.3/Examples/peer_script.bash +=================================================================== +--- x3270-3.3/Examples/peer_script.bash.orig ++++ x3270-3.3/Examples/peer_script.bash +@@ -60,9 +60,9 @@ ip=/tmp/ip.$$ op=/tmp/op.$$ rm -f $ip $op trap "rm -f $ip $op" EXIT @@ -13,11 +14,12 @@ +mknod $op p || exit 1 # Start x3270 - x3270 -script -model 2 -color <$ip >$op & ---- x3270-3.3/Examples/peer_script.sh -+++ x3270-3.3/Examples/peer_script.sh 2000/06/07 07:37:48 -@@ -58,10 +58,10 @@ - ip=/tmp/ip.$$ + x3270 -script -model 2 <$ip >$op & +Index: x3270-3.3/Examples/peer_script.sh +=================================================================== +--- x3270-3.3/Examples/peer_script.sh.orig ++++ x3270-3.3/Examples/peer_script.sh +@@ -59,9 +59,9 @@ ip=/tmp/ip.$$ op=/tmp/op.$$ rm -f $ip $op trap "rm -f $ip $op" 0 @@ -29,4 +31,4 @@ +mknod $op p || exit 1 # Start x3270 - x3270 -script -model 2 -color <$ip >$op & + x3270 -script -model 2 <$ip >$op & diff --git a/pr3270-memleak.patch b/pr3270-memleak.patch index 84e6ebb..f40a665 100644 --- a/pr3270-memleak.patch +++ b/pr3270-memleak.patch @@ -1,6 +1,8 @@ ---- pr3287-3.3/telnet.c +Index: pr3287-3.3/telnet.c +=================================================================== +--- pr3287-3.3/telnet.c.orig +++ pr3287-3.3/telnet.c -@@ -308,8 +308,13 @@ +@@ -315,8 +315,13 @@ negotiate(int s, char *lu, char *assoc) cstate != CONNECTED_3270 && /* TN3270 */ cstate != NOT_CONNECTED) { /* gave up */ diff --git a/usr_local_bin.patch b/usr_local_bin.patch index df31903..261f08a 100644 --- a/usr_local_bin.patch +++ b/usr_local_bin.patch @@ -1,18 +1,22 @@ GNU binaries live in /bin and /usr/bin in SuSE systems: ---- x3270-3.3/Examples/peer_script.expect -+++ x3270-3.3/Examples/peer_script.expect 2000/06/07 07:37:48 +Index: x3270-3.3/Examples/peer_script.expect +=================================================================== +--- x3270-3.3/Examples/peer_script.expect.orig ++++ x3270-3.3/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 ---- x3270-3.3/Examples/cms_logon.bash 2001/07/25 07:44:50 1.1 -+++ x3270-3.3/Examples/cms_logon.bash 2001/07/25 07:45:10 +Index: x3270-3.3/Examples/cms_logon.bash +=================================================================== +--- x3270-3.3/Examples/cms_logon.bash.orig ++++ x3270-3.3/Examples/cms_logon.bash @@ -1,4 +1,4 @@ -#! /usr/local/bin/bash +#! /bin/bash - # Copyright 1995, 2000 by Paul Mattes. + # Copyright 1995, 2000, 2002 by Paul Mattes. # Permission to use, copy, modify, and distribute this software and its diff --git a/x3270.changes b/x3270.changes index a400062..7b013bb 100644 --- a/x3270.changes +++ b/x3270.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 15 14:06:17 CET 2009 - meissner@suse.de + +- refresh patches with fuzz=0 + ------------------------------------------------------------------- Tue Apr 8 12:10:41 CEST 2008 - max@suse.de diff --git a/x3270.spec b/x3270.spec index ba8b805..d8268b8 100644 --- a/x3270.spec +++ b/x3270.spec @@ -40,11 +40,11 @@ BuildRequires: XFree86 XFree86-devel %define xlibraries /usr/X11R6/%{_lib} %endif BuildRequires: freetype2 tcl-devel -License: X11/MIT +License: MIT License (or similar) Group: System/X11/Terminals AutoReqProv: on Version: 3.2.20 -Release: 508 +Release: 509 Summary: A Family of IBM 3270 Terminal Emulators Url: http://x3270.bgp.nu Source0: http://x3270.bgp.nu/download/x3270-334p4.tgz @@ -215,8 +215,8 @@ cd x3270-3.3 install -m 644 X3270.xad \ $RPM_BUILD_ROOT%{appdefdir}/app-defaults/X3270 # clean up: - # remove remainders of patching the examples - rm Examples/*.orig + # remove remainders of patching the examples, if existing + rm -v Examples/*.orig || true cd .. # the console variant cd c3270-3.3 @@ -302,143 +302,3 @@ chmod ugo-x $RPM_BUILD_ROOT/usr/share/man/man{1,5}/* %doc %attr(644,root,root) README.SuSE %changelog -* Tue Apr 08 2008 max@suse.de -- Fixed build for Tcl 8.5. -* Thu Mar 29 2007 ro@suse.de -- added ncurses-devel to buildreq -* Wed Mar 28 2007 mfabian@suse.de -- add run_suseconfig_fonts to %%post and %%postun -* Fri Nov 10 2006 ihno@suse.de -- fixing wrong permissions of man pages -* Thu Aug 10 2006 mfabian@suse.de -- move fonts, binaries, man-pages to the new paths used by - X11R7 (fixes build in STABLE). -- use RPM_OPT_FLAGS -* Thu Feb 16 2006 ro@suse.de -- fix directory permissions -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Jun 20 2005 yxu@suse.de -- fixed patch to apply -* Thu Jun 16 2005 yxu@suse.de -- update sources to version 3.3.4 -* Thu Apr 21 2005 coolo@suse.de -- fix compilation -* Tue May 11 2004 hare@suse.de -- Do not call mkfontsdir to avoid dependency problems (#40318). -* Wed Apr 28 2004 hare@suse.de -- Fix memleak in pr3270 (#39528). -* Fri Feb 27 2004 hare@suse.de -- Update to 3.3.2p1. -* Sat Jan 10 2004 adrian@suse.de -- fix to build as user -* Sun Nov 02 2003 ro@suse.de -- updated neededforbuild -* Mon Aug 11 2003 hare@suse.de -- Fixed ppc64 build problems. -- Fixed gcc-3.3 compilation warnings. -* Fri Jul 18 2003 hare@suse.de -- Added freetype2 to prerequisites. -* Thu Jun 12 2003 kukuk@suse.de -- Fix filelist -* Fri Jun 06 2003 mmj@suse.de -- Remove unwanted files from BuildRoot. -* Mon Feb 24 2003 froh@suse.de -- updated to 3.2.20 bug fix only drop which incoroprates all - the patches we had on top of 3.2.19 -* Wed Nov 27 2002 sf@suse.de -- added patch x3270-3.2.19.x86_64.diff to prevent segfaulting - on x86_64 -* Thu Sep 26 2002 ro@suse.de -- removed bogus self-provides again (3rd time) -* Thu Sep 26 2002 froh@suse.de -- during installation with YaST, mkfontdir will be called by yast - automatically. thus added test to %%-post* scripts to not - run mkfontdir in case the package is installed from withing YaST. - (#20127) -* Mon Sep 23 2002 froh@suse.de -- drop use of chroot and relative paths in %%post/%%postun (#20011) - and replace xf86 in PreReq by name of mkfontdir binary -- fix date in README.SuSE -* Tue Aug 20 2002 ro@suse.de -- built tcl3270 without tclx -* Tue Aug 13 2002 froh@suse.de -- add pacthes for known bugs - * R1: x3270 Not Recognizing crosshair Resource - * R2: c3270 Goes Into Tight Loop on End-of-File - * R3: Screen Resizing Broken (this one hit us) - * R4: Keymap Saved as 'base' -* Sun Jul 28 2002 kukuk@suse.de -- Add xf86 again -* Sat Jul 27 2002 adrian@suse.de -- fix neededforbuld and PreRequires -* Fri Jul 12 2002 max@suse.de -- Fixed tcl3270-3.2/configure.in for tcl8.4 -* Mon Jul 01 2002 froh@suse.de -- updated to current release 3.2.19 -- added the state of the art IBM 026 keypunch emulator :) -* Tue Feb 19 2002 froh@suse.de -- added most recent bugfixes from x3270 site -- switched to the new simpler all-in-one-tarball -* Fri Jan 25 2002 froh@suse.de -- upgraded to current release 3.2.18 + current bugfixes -* Mon Dec 10 2001 ro@suse.de -- there is no /usr/etc allowed in fhs 2.2 -* Tue Nov 20 2001 froh@suse.de -- added current patches from x3270 site: - * fixed cut&paste if selection is spanning several lines - * keymap fix (C-u and C-w definitions had been hidden) -* Wed Oct 31 2001 bk@suse.de -- use mode 644 for config file /usr/etc/x3270/ibm_hosts -* Thu Oct 18 2001 bk@suse.de -- make ibm_hosts file noreplace(file format was not updated, old can be used) -* Mon Jul 30 2001 froh@suse.de -- patched /usr/local/bin to /usr/bin in a new expect script below - s3270/Examples/* and checked that no /usr/local are left :) -* Wed Jul 25 2001 froh@suse.de -- patched away /usr/local/bin in a new shell script below - x3270/Examples/* -* Tue Jul 24 2001 froh@suse.de -- upgraded to current release 3.2.17 + current bugfixes -* Wed Mar 28 2001 froh@suse.de -- use 'size_t' consistently instead of 'unsigned' to make pr3278 build - on axp (use-size_t.diff) -* Wed Mar 28 2001 froh@suse.de -- upgraded to current version 3.2.16 -- added c3270, tcl3270, s3270 and made them coexist with each other - (common config file, shared helpers) -* Thu Nov 30 2000 fober@suse.de -- upgraded to current version 3.2.14 -- adopted to current FHS -- introduced BuildRoot to clean up %%files-section -* Fri Oct 27 2000 fober@suse.de -- fixed calling of mkfontdir(needs chroot if no xshared in instsys) in - %%postun as well -* Mon Oct 09 2000 bk@suse.de -- fixed calling of mkfontdir(needs chroot if no xshared in instsys) in - %%postin -* Wed Jun 07 2000 ro@suse.de -- fixed path for mkfontdir -* Tue Feb 01 2000 mkraft@suse.de -- updated to new (alpha) version 3.2, some changes to spec file - - pre- and postinstall scripts to rebuild fonts.dir -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Wed Mar 17 1999 ro@suse.de -- remove .orig with -f -* Sat Sep 19 1998 ro@suse.de -- dont redeclare sys_errlist for glibc -* Thu Jul 23 1998 werner@suse.de -- Check exit status of mknod in peer_script.(ba)sh -* Mon Nov 17 1997 ro@suse.de -- changes /usr/local/bin/expect to /usr/bin/expect - and /bin/ksh to /usr/bin/ksh -* Mon Oct 13 1997 hf@suse.de -- ready for autobuild -* Fri Jun 06 1997 bs@suse.de -- removed usr/X11R6/lib/X11/fonts/misc/fonts.dir -* Mon Jun 02 1997 hf@suse.de - Added the x3270 app-defaults file. -* Wed May 21 1997 hf@suse.de - A new version 3.1.1.6 - x3270 is an IBM 3278/3279 terminal emulator for X windows.