- updated to 3.3.13ga6 (#1006023)
This commit is contained in:
parent
5762c86794
commit
71a987aeab
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ suite3270-3.3.10ga4-src.tgz
|
||||
/suite3270-3.3.12ga11-src.tgz
|
||||
/suite3270-3.3.12ga12-src.tgz
|
||||
/suite3270-3.3.12ga13-src.tgz
|
||||
/suite3270-3.3.13ga6-src.tgz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
df11e3f16c0a6b2e5b1ddb3c46fb3f88 suite3270-3.3.12ga13-src.tgz
|
||||
e23d440807c8f9703b239eecf9cf87db suite3270-3.3.13ga6-src.tgz
|
||||
|
||||
@ -1,175 +0,0 @@
|
||||
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
|
||||
|
||||
166
x3270-3.3.13-ibmhostpath.patch
Normal file
166
x3270-3.3.13-ibmhostpath.patch
Normal file
@ -0,0 +1,166 @@
|
||||
diff -up x3270-3.3.13ga6/c3270-3.3/c3270.man.ibmhosts x3270-3.3.13ga6/c3270-3.3/c3270.man
|
||||
--- x3270-3.3.13ga6/c3270-3.3/c3270.man.ibmhosts 2013-09-08 03:01:54.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/c3270-3.3/c3270.man 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -3386,7 +3386,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.13ga6/c3270-3.3/host.c.ibmhosts x3270-3.3.13ga6/c3270-3.3/host.c
|
||||
--- x3270-3.3.13ga6/c3270-3.3/host.c.ibmhosts 2013-07-12 00:03:24.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/c3270-3.3/host.c 2013-09-10 16:41:13.000000000 +0200
|
||||
@@ -130,7 +130,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, DS_VARS | DS_TILDE);
|
||||
hf = fopen(hostfile_name, "r");
|
||||
diff -up x3270-3.3.13ga6/c3270-3.3/Makefile.in.ibmhosts x3270-3.3.13ga6/c3270-3.3/Makefile.in
|
||||
--- x3270-3.3.13ga6/c3270-3.3/Makefile.in.ibmhosts 2013-07-12 00:03:25.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/c3270-3.3/Makefile.in 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -94,10 +94,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.13ga6/s3270-3.3/host.c.ibmhosts x3270-3.3.13ga6/s3270-3.3/host.c
|
||||
--- x3270-3.3.13ga6/s3270-3.3/host.c.ibmhosts 2013-07-12 00:03:24.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/s3270-3.3/host.c 2013-09-10 16:41:23.000000000 +0200
|
||||
@@ -130,7 +130,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, DS_VARS | DS_TILDE);
|
||||
hf = fopen(hostfile_name, "r");
|
||||
diff -up x3270-3.3.13ga6/s3270-3.3/s3270.man.ibmhosts x3270-3.3.13ga6/s3270-3.3/s3270.man
|
||||
--- x3270-3.3.13ga6/s3270-3.3/s3270.man.ibmhosts 2013-09-08 03:01:52.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/s3270-3.3/s3270.man 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -2103,7 +2103,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.13ga6/s3270-3.3/X3270.xad.ibmhosts x3270-3.3.13ga6/s3270-3.3/X3270.xad
|
||||
--- x3270-3.3.13ga6/s3270-3.3/X3270.xad.ibmhosts 2013-09-06 22:52:05.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/s3270-3.3/X3270.xad 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -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.13ga6/x3270-3.3/ibm_hosts.man.ibmhosts x3270-3.3.13ga6/x3270-3.3/ibm_hosts.man
|
||||
--- x3270-3.3.13ga6/x3270-3.3/ibm_hosts.man.ibmhosts 2013-09-08 03:01:49.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/x3270-3.3/ibm_hosts.man 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -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.13ga6/x3270-3.3/Imakefile.in.ibmhosts x3270-3.3.13ga6/x3270-3.3/Imakefile.in
|
||||
--- x3270-3.3.13ga6/x3270-3.3/Imakefile.in.ibmhosts 2013-07-12 00:03:27.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/x3270-3.3/Imakefile.in 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -191,8 +191,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.
|
||||
@@ -221,8 +221,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.13ga6/x3270-3.3/Makefile.in.ibmhosts x3270-3.3.13ga6/x3270-3.3/Makefile.in
|
||||
--- x3270-3.3.13ga6/x3270-3.3/Makefile.in.ibmhosts 2013-07-12 00:03:27.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/x3270-3.3/Makefile.in 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -128,10 +128,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.13ga6/x3270-3.3/x3270.man.ibmhosts x3270-3.3.13ga6/x3270-3.3/x3270.man
|
||||
--- x3270-3.3.13ga6/x3270-3.3/x3270.man.ibmhosts 2013-09-08 03:01:49.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/x3270-3.3/x3270.man 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -5102,7 +5102,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 -up x3270-3.3.13ga6/x3270-3.3/X3270.xad.ibmhosts x3270-3.3.13ga6/x3270-3.3/X3270.xad
|
||||
--- x3270-3.3.13ga6/x3270-3.3/X3270.xad.ibmhosts 2013-09-06 22:52:05.000000000 +0200
|
||||
+++ x3270-3.3.13ga6/x3270-3.3/X3270.xad 2013-09-10 16:40:57.000000000 +0200
|
||||
@@ -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
|
||||
11
x3270.spec
11
x3270.spec
@ -4,7 +4,7 @@
|
||||
%define majorver 3.3
|
||||
Summary: An X Window System based IBM 3278/3279 terminal emulator
|
||||
Name: x3270
|
||||
Version: 3.3.12ga13
|
||||
Version: 3.3.13ga6
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Group: Applications/Internet
|
||||
@ -15,7 +15,7 @@ Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz
|
||||
Source1: x3270.png
|
||||
Source2: x3270.desktop
|
||||
Patch0: x3270-3.3.10-paths.patch
|
||||
Patch1: x3270-3.3.10-ibmhostpath.patch
|
||||
Patch1: x3270-3.3.13-ibmhostpath.patch
|
||||
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: readline-devel
|
||||
@ -68,8 +68,8 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM
|
||||
%setup -q -c
|
||||
# delete windows and tcl sources:
|
||||
rm -rf wpr3287* wc3270* ws3270* tcl3270*
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch0 -p1 -b .paths
|
||||
%patch1 -p1 -b .ibmhosts
|
||||
|
||||
# update for aarch64 (#926737)
|
||||
for i in x3270-%{majorver} c3270-%{majorver} pr3287-%{majorver} s3270-%{majorver}; do
|
||||
@ -189,6 +189,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 10 2013 Dan Horák <dan[at]danny.cz> - 3.3.13ga6-1
|
||||
- updated to 3.3.13ga6 (#1006023)
|
||||
|
||||
* Fri Aug 23 2013 Dan Horák <dan[at]danny.cz> - 3.3.12ga13-1
|
||||
- updated to 3.3.12ga13 (#959961)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user