rpms/x3270
6
0
Fork 0
Code Issues Pull Requests Releases Activity
abc4009ed1
x3270/x3270-3.3.13-ibmhostpath.patch
Dan Horák 71a987aeab - updated to 3.3.13ga6 (#1006023)
2013-09-10 16:51:10 +02:00

167 lines
7.5 KiB
Diff
Raw Blame History

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
Reference in New Issue View Git Blame Copy Permalink