From 76fdf58d8240ed7626844c044217842319817869 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Thu, 25 Sep 2014 11:21:34 +0100 Subject: [PATCH] Import xpa_2.1.15-4.debian.tar.xz [dgit import tarball xpa 2.1.15-4 xpa_2.1.15-4.debian.tar.xz] --- changelog | 48 ++++++ clean | 3 + compat | 1 + control | 76 +++++++++ copyright | 48 ++++++ libxpa-dev.doc-base | 19 +++ libxpa-dev.docs | 2 + libxpa-dev.install | 42 +++++ libxpa-dev.lintian-overrides | 5 + libxpa1.install | 2 + libxpa1.symbols | 139 +++++++++++++++ patches/fix_manpages.patch | 320 +++++++++++++++++++++++++++++++++++ patches/fix_paths.patch | 67 ++++++++ patches/fix_xpa_h.patch | 31 ++++ patches/hardening.patch | 31 ++++ patches/install_tclxpa.patch | 98 +++++++++++ patches/series | 5 + rules | 25 +++ source/format | 1 + tcl-xpa.install | 3 + watch | 2 + xpa-tools.install | 12 ++ 22 files changed, 980 insertions(+) create mode 100644 changelog create mode 100644 clean create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 libxpa-dev.doc-base create mode 100644 libxpa-dev.docs create mode 100644 libxpa-dev.install create mode 100644 libxpa-dev.lintian-overrides create mode 100644 libxpa1.install create mode 100644 libxpa1.symbols create mode 100644 patches/fix_manpages.patch create mode 100644 patches/fix_paths.patch create mode 100644 patches/fix_xpa_h.patch create mode 100644 patches/hardening.patch create mode 100644 patches/install_tclxpa.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 tcl-xpa.install create mode 100644 watch create mode 100644 xpa-tools.install diff --git a/changelog b/changelog new file mode 100644 index 0000000..3ceb373 --- /dev/null +++ b/changelog @@ -0,0 +1,48 @@ +xpa (2.1.15-4) unstable; urgency=low + + * Update maintainers e-mail address + * Update standards version to 3.9.6. No changes needed. + * Change VCS location to debian-astro + * Remove conf.h include from xpa.h. Closes: #764406 + * Add symbols file + + -- Ole Streicher Thu, 25 Sep 2014 12:21:34 +0200 + +xpa (2.1.15-3) unstable; urgency=low + + * update config.{sub,guess} for the AArch64 port. Closes: #727523 + + -- Ole Streicher Sun, 27 Oct 2013 17:26:34 +0100 + +xpa (2.1.15-2) unstable; urgency=low + + * Fix FTBS on IA64 + + -- Ole Streicher Thu, 25 Jul 2013 17:29:25 +0200 + +xpa (2.1.15-1) unstable; urgency=low + + * New upstream version + * Change priority to optional + * Change compat to 9: fixes lintian warnings + * Push standards to 3.9.4: No changes needed + + -- Ole Streicher Thu, 25 Jul 2013 10:21:05 +0200 + +xpa (2.1.14-2) unstable; urgency=low + + * Install correct pkgIndex.tcl in tcl-xpa + + -- Ole Streicher Sat, 09 Jun 2012 10:12:51 +0200 + +xpa (2.1.14-1) unstable; urgency=low + + * New upstream version. + + -- Ole Streicher Fri, 08 Jun 2012 16:05:54 +0200 + +xpa (2.1.13-1) unstable; urgency=low + + * Initial release. (Closes: #655651) + + -- Ole Streicher Thu, 26 Jan 2012 09:20:00 +0100 diff --git a/clean b/clean new file mode 100644 index 0000000..c3daf21 --- /dev/null +++ b/clean @@ -0,0 +1,3 @@ +config.log +config.status.lineno + diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..33888f4 --- /dev/null +++ b/control @@ -0,0 +1,76 @@ +Source: xpa +Section: science +Priority: optional +Maintainer: Ole Streicher +Build-Depends: autotools-dev, debhelper (>= 9), libxt-dev, tcl-dev +Standards-Version: 3.9.6 +Homepage: http://hea-www.harvard.edu/RD/xpa/ +Vcs-Git: git://anonscm.debian.org/debian-astro/packages/xpa.git +Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/xpa.git + +Package: libxpa1 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Seamless communication between Unix programs (shared library) + The XPA messaging system provides seamless communication between many kinds + of Unix programs, including X programs and Tcl/Tk programs. It also provides + an easy way for users to communicate with these XPA-enabled programs by + executing XPA client commands in the shell or by utilizing such commands in + scripts. Because XPA works both at the programming level and the shell level, + it is a powerful tool for unifying any analysis environment: users and + programmers have great flexibility in choosing the best level or levels at + which to access XPA services, and client access can be extended or modified + easily at any time. + . + This package contains the shared library. + +Package: libxpa-dev +Section: libdevel +Architecture: any +Depends: libxpa1 (= ${binary:Version}), ${misc:Depends} +Description: Seamless communication between Unix programs (development files) + The XPA messaging system provides seamless communication between many kinds + of Unix programs, including X programs and Tcl/Tk programs. It also provides + an easy way for users to communicate with these XPA-enabled programs by + executing XPA client commands in the shell or by utilizing such commands in + scripts. Because XPA works both at the programming level and the shell level, + it is a powerful tool for unifying any analysis environment: users and + programmers have great flexibility in choosing the best level or levels at + which to access XPA services, and client access can be extended or modified + easily at any time. + . + This package contains the header files and the static library. + +Package: xpa-tools +Architecture: any +Depends: libxpa1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Description: Tools for seamless communication between Unix programs + The XPA messaging system provides seamless communication between many kinds + of Unix programs, including X programs and Tcl/Tk programs. It also provides + an easy way for users to communicate with these XPA-enabled programs by + executing XPA client commands in the shell or by utilizing such commands in + scripts. Because XPA works both at the programming level and the shell level, + it is a powerful tool for unifying any analysis environment: users and + programmers have great flexibility in choosing the best level or levels at + which to access XPA services, and client access can be extended or modified + easily at any time. + . + This package contains the additional tools. + +Package: tcl-xpa +Architecture: any +Section: interpreters +Depends: libxpa1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Description: Seamless communication between Unix programs (Tcl interface) + The XPA messaging system provides seamless communication between many kinds + of Unix programs, including X programs and Tcl/Tk programs. It also provides + an easy way for users to communicate with these XPA-enabled programs by + executing XPA client commands in the shell or by utilizing such commands in + scripts. Because XPA works both at the programming level and the shell level, + it is a powerful tool for unifying any analysis environment: users and + programmers have great flexibility in choosing the best level or levels at + which to access XPA services, and client access can be extended or modified + easily at any time. + . + This package contains the Tcl interface. diff --git a/copyright b/copyright new file mode 100644 index 0000000..c1b3c1d --- /dev/null +++ b/copyright @@ -0,0 +1,48 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: XPA +Upstream-Author: Eric Mandel +Source: http://hea-www.harvard.edu/RD/xpa/ + +Files: * +Copyright: Copyright (c) 1999-2003 Smithsonian Astrophysical Observatory +License: LGPL + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + +Files: install-sh +Copyright: Copyright 1991 by the Massachusetts Institute of Technology +License: MIT + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of M.I.T. not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. M.I.T. makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + +Files: mklib +Copyright: Copyright (C) 1999-2006 Brian Paul +License: MIT/X11 + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: debian/* +Copyright: not applicable +License: public-domain + Debian packaging by Ole Streicher diff --git a/libxpa-dev.doc-base b/libxpa-dev.doc-base new file mode 100644 index 0000000..30012f7 --- /dev/null +++ b/libxpa-dev.doc-base @@ -0,0 +1,19 @@ +Document: xpa +Title: XPA: Public Access to Data and Algorithms +Section: Programming +Abstract: The XPA messaging system provides seamless communication between + many kinds of Unix programs, including X programs and Tcl/Tk programs. It + also provides an easy way for users to communicate with XPA-enabled programs + by executing XPA client commands in the shell or by utilizing such commands + in scripts. Because XPA works both at the programming level and the shell + level, it is a powerful tool for unifying any analysis environment: users and + programmers have great flexibility in choosing the best level or levels at + which to access XPA services, and client access can be extended or modified + easily at any time. + +Format: PDF +Files: /usr/share/doc/libxpa-dev/xpa.pdf.gz + +Format: HTML +Index: /usr/share/doc/libxpa-dev/help.html +Files: /usr/share/doc/libxpa-dev/*.html diff --git a/libxpa-dev.docs b/libxpa-dev.docs new file mode 100644 index 0000000..fc2874e --- /dev/null +++ b/libxpa-dev.docs @@ -0,0 +1,2 @@ +doc/*.html +doc/xpa.pdf diff --git a/libxpa-dev.install b/libxpa-dev.install new file mode 100644 index 0000000..e5855be --- /dev/null +++ b/libxpa-dev.install @@ -0,0 +1,42 @@ +usr/include/prsetup.h +usr/include/xpa.h +usr/lib/libxpa.a +usr/lib/libxpa.so +usr/share/man/man3/xpaaccess.3 +usr/share/man/man3/xpaatexit.3 +usr/share/man/man3/xpacleanup.3 +usr/share/man/man3/xpaclient.3 +usr/share/man/man3/xpaclose.3 +usr/share/man/man3/xpacmdadd.3 +usr/share/man/man3/xpacmddel.3 +usr/share/man/man3/xpacmdnew.3 +usr/share/man/man3/xpafree.3 +usr/share/man/man3/xpaget.3 +usr/share/man/man3/xpagetfd.3 +usr/share/man/man3/xpainfo.3 +usr/share/man/man3/xpainfonew.3 +usr/share/man/man3/xpamacros.3 +usr/share/man/man3/xpamainloop.3 +usr/share/man/man3/xpanew.3 +usr/share/man/man3/xpanslookup.3 +usr/share/man/man3/xpaopen.3 +usr/share/man/man3/xpapoll.3 +usr/share/man/man3/xparace.3 +usr/share/man/man3/xpaserver.3 +usr/share/man/man3/xpaset.3 +usr/share/man/man3/xpasetfd.3 +usr/share/man/man7/xpa.7 +usr/share/man/man7/xpaacl.7 +usr/share/man/man7/xpachanges.7 +usr/share/man/man7/xpacode.7 +usr/share/man/man7/xpacommon.7 +usr/share/man/man7/xpaconvert.7 +usr/share/man/man7/xpaenv.7 +usr/share/man/man7/xpainet.7 +usr/share/man/man7/xpaintro.7 +usr/share/man/man7/xpamethod.7 +usr/share/man/man7/xpaname.7 +usr/share/man/man7/xpaoom.7 +usr/share/man/man7/xpatemplate.7 +usr/share/man/man7/xpausers.7 +usr/share/man/man7/xpaxt.7 diff --git a/libxpa-dev.lintian-overrides b/libxpa-dev.lintian-overrides new file mode 100644 index 0000000..b90d5f7 --- /dev/null +++ b/libxpa-dev.lintian-overrides @@ -0,0 +1,5 @@ +# We need the changelog.html uncompressed since it is linked in the +# upstream HTML documentation. Although this is a policy violation, +# we ignore Lintian here since the file will not grow infinite. +# See http://lists.debian.org/debian-mentors/2012/01/msg00400.html +changelog-file-not-compressed changelog.html diff --git a/libxpa1.install b/libxpa1.install new file mode 100644 index 0000000..a37b660 --- /dev/null +++ b/libxpa1.install @@ -0,0 +1,2 @@ +usr/lib/libxpa.so.1 +usr/lib/libxpa.so.1.0 diff --git a/libxpa1.symbols b/libxpa1.symbols new file mode 100644 index 0000000..ae96b30 --- /dev/null +++ b/libxpa1.symbols @@ -0,0 +1,139 @@ +libxpa.so.1 libxpa1 #MINVER# + Access@Base 2.1.14 + ClipBoardFree@Base 2.1.14 + ExpandEnv@Base 2.1.14 + Find@Base 2.1.14 + Launch@Base 2.1.14 + LaunchPid@Base 2.1.14 + ResolvePath@Base 2.1.14 + XPAAccess@Base 2.1.14 + XPAAclAdd@Base 2.1.14 + XPAAclCheck@Base 2.1.14 + XPAAclDel@Base 2.1.14 + XPAAclEdit@Base 2.1.14 + XPAAclFree@Base 2.1.14 + XPAAclNew@Base 2.1.14 + XPAActive@Base 2.1.14 + XPAActiveFd@Base 2.1.14 + XPAAddSelect@Base 2.1.14 + XPAArgvParamlist@Base 2.1.14 + XPAAtExit@Base 2.1.14 + XPACleanup@Base 2.1.14 + XPAClientAddSelect@Base 2.1.14 + XPAClientProcessSelect@Base 2.1.14 + XPAClientValid@Base 2.1.14 + XPAClose@Base 2.1.14 + XPACloseData@Base 2.1.14 + XPACmdAdd@Base 2.1.14 + XPACmdDel@Base 2.1.14 + XPACmdInternalReceive@Base 2.1.14 + XPACmdInternalSend@Base 2.1.14 + XPACmdLookup@Base 2.1.14 + XPACmdLookupReserved@Base 2.1.14 + XPACmdNew@Base 2.1.14 + XPAEndian@Base 2.1.14 + XPAError@Base 2.1.14 + XPAFree@Base 2.1.14 + XPAFreeReserved@Base 2.1.14 + XPAGet@Base 2.1.14 + XPAGetBuf@Base 2.1.14 + XPAGetFd@Base 2.1.14 + XPAGetReserved@Base 2.1.14 + XPAGets@Base 2.1.14 + XPAHandler@Base 2.1.14 + XPAIOCallsXPA@Base 2.1.14 + XPAInfo@Base 2.1.14 + XPAInfoNew@Base 2.1.14 + XPAInitEnv@Base 2.1.14 + XPAInitReserved@Base 2.1.14 + XPALevelGet@Base 2.1.14 + XPALevelSet@Base 2.1.14 + XPALevelSpaces@Base 2.1.14 + XPAListAdd@Base 2.1.14 + XPAListDel@Base 2.1.14 + XPAListHead@Base 2.1.14 + XPALongTimeout@Base 2.1.14 + XPAMainLoop@Base 2.1.14 + XPAMessage@Base 2.1.14 + XPAMethod@Base 2.1.14 + XPAMode@Base 2.1.14 + XPAMtype@Base 2.1.14 + XPANSAdd@Base 2.1.14 + XPANSClose@Base 2.1.14 + XPANSDel@Base 2.1.14 + XPANSKeepAlive@Base 2.1.14 + XPANSLookup@Base 2.1.14 + XPANSMethod@Base 2.1.14 + XPANew@Base 2.1.14 + XPAOK@Base 2.1.14 + XPAOpen@Base 2.1.14 + XPAParseIpPort@Base 2.1.14 + XPAParseName@Base 2.1.14 + XPAParseUnixSocket@Base 2.1.14 + XPAPoll@Base 2.1.14 + XPAPort@Base 2.1.14 + XPAPortAdd@Base 2.1.14 + XPAPortDel@Base 2.1.14 + XPAPortFree@Base 2.1.14 + XPAPortNew@Base 2.1.14 + XPAProcessSelect@Base 2.1.14 + XPAPutBuf@Base 2.1.14 + XPAPuts@Base 2.1.14 + XPAReceiveAcl@Base 2.1.14 + XPAReceiveClipboard@Base 2.1.14 + XPAReceiveCommands@Base 2.1.14 + XPAReceiveLTimeout@Base 2.1.14 + XPAReceiveRemote@Base 2.1.14 + XPAReceiveSTimeout@Base 2.1.14 + XPARemote@Base 2.1.14 + XPASaveJmp@Base 2.1.14 + XPASendAcl@Base 2.1.14 + XPASendClipboard@Base 2.1.14 + XPASendCommands@Base 2.1.14 + XPASendLTimeout@Base 2.1.14 + XPASendRemote@Base 2.1.14 + XPASendSTimeout@Base 2.1.14 + XPASet@Base 2.1.14 + XPASetBuf@Base 2.1.14 + XPASetFd@Base 2.1.14 + XPASetFree@Base 2.1.14 + XPAShortTimeout@Base 2.1.14 + XPASigusr1@Base 2.1.14 + XPASleep@Base 2.1.14 + XPATimestamp@Base 2.1.14 + XPATmpdir@Base 2.1.14 + XPAValid@Base 2.1.14 + XPAVerbosity@Base 2.1.14 + XPAVersionCheck@Base 2.1.14 + XPAVersionWarn@Base 2.1.14 + _XPAValid@Base 2.1.14 + alrmconnect@Base 2.1.14 + cluc@Base 2.1.14 + culc@Base 2.1.14 + freedelim@Base 2.1.14 + freedtable@Base 2.1.14 + gethost@Base 2.1.14 + gethostip@Base 2.1.14 + getiphost@Base 2.1.14 + isfalse@Base 2.1.14 + istrue@Base 2.1.14 + keyword@Base 2.1.14 + lastdelim@Base 2.1.14 + macro@Base 2.1.14 + newdelim@Base 2.1.14 + newdtable@Base 2.1.14 + noblkconnect@Base 2.1.14 + nocr@Base 2.1.14 + nowhite@Base 2.1.14 + strtoul16@Base 2.1.14 + tmatch@Base 2.1.14 + use_localhost@Base 2.1.14 + word@Base 2.1.14 + xalloc_savejmp@Base 2.1.14 + xcalloc@Base 2.1.14 + xfree@Base 2.1.14 + xmalloc@Base 2.1.14 + xpaMessbuf@Base 2.1.14 + xpa_gtk@Base 2.1.14 + xrealloc@Base 2.1.14 + xstrdup@Base 2.1.14 diff --git a/patches/fix_manpages.patch b/patches/fix_manpages.patch new file mode 100644 index 0000000..f1021a6 --- /dev/null +++ b/patches/fix_manpages.patch @@ -0,0 +1,320 @@ +Author: Ole Streicher +Description: Fix manpages (section, name, and spellfixes) so that lintian + does not complain +--- a/man/man1/xpachanges.1 ++++ b/man/man1/xpachanges.1 +@@ -123,14 +123,14 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpachanges 1" +-.TH xpachanges 1 "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpachanges 7" ++.TH xpachanges 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l + .nh + .SH "NAME" +-\&\fB\s-1XPA\s0 Changes: Changes For Users from \s-1XPA\s0 1.0 and 2.0\fR ++XPAChanges \- Changes For Users from XPA 1.0 and 2.0 + .SH "SYNOPSIS" + .IX Header "SYNOPSIS" + This document describes changes that will affect users who migrate +--- a/man/man3/xpaaccess.3 ++++ b/man/man3/xpaaccess.3 +@@ -130,8 +130,7 @@ + .if n .ad l + .nh + .SH "NAME" +-XPAAccess: return XPA access points matching +-template (XPA 2.1 and above) ++XPAAccess \- return XPA access points matching template (XPA 2.1 and above) + .SH "SYNOPSIS" + .IX Header "SYNOPSIS" + .Vb 1 +--- a/man/man3/xpamacros.3 ++++ b/man/man3/xpamacros.3 +@@ -130,7 +130,7 @@ + .if n .ad l + .nh + .SH "NAME" +-\&\fB\s-1XPA\s0 Server Callback Macros\fR ++XPAMacros \- Server Callback Macros + .SH "SYNOPSIS" + .IX Header "SYNOPSIS" + .Vb 1 +--- a/man/man3/xparace.3 ++++ b/man/man3/xparace.3 +@@ -130,7 +130,7 @@ + .if n .ad l + .nh + .SH "NAME" +-\&\fB\s-1XPA\s0 Race Conditions\fR ++XPARace \- Race Conditions + .SH "SYNOPSIS" + .IX Header "SYNOPSIS" + Potential \s-1XPA\s0 race conditions and how to avoid them. +--- a/man/mann/xpa.n ++++ b/man/mann/xpa.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpa n" +-.TH xpa n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpa 7" ++.TH xpa 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +@@ -169,22 +169,22 @@ + Choose from the following topics: + .IP "\(bu" 4 + Introduction to \s-1XPA\s0 +-[xpaintro(n)] ++[xpaintro(7)] + .IP "\(bu" 4 + Access Point Names and Templates +-[xpatemplate(n)] ++[xpatemplate(7)] + .IP "\(bu" 4 + Getting Common Information About Access Points +-[xpacommon(n)] ++[xpacommon(7)] + .IP "\(bu" 4 + Communication Methods +-[xpamethod(n)] ++[xpamethod(7)] + .IP "\(bu" 4 + Communication Between Hosts +-[xpainet(n)] ++[xpainet(7)] + .IP "\(bu" 4 + Distinguishing Users +-[xpausers(n)] ++[xpausers(7)] + .IP "\(bu" 4 + \&\s-1XPA\s0 User Programs + .RS 4 +@@ -283,10 +283,10 @@ + [\fIxpaaccess\fR\|(3)] + .IP "\(bu" 4 + The XPA/Xt Interface: Xt interface to \s-1XPA\s0 +-[xpaxt(n)] ++[xpaxt(7)] + .IP "\(bu" 4 + The XPA/Tcl Interface: Tcl interface to \s-1XPA\s0 +-[xpatcl(n)] ++[xpa(3tcl)] + .RE + .RS 4 + .RE +@@ -295,10 +295,10 @@ + .RS 4 + .IP "\(bu" 4 + Environment Variables +-[xpaenv(n)] ++[xpaenv(7)] + .IP "\(bu" 4 + Access Control +-[xpaacl(n)] ++[xpaacl(7)] + .RE + .RS 4 + .RE +--- a/man/mann/xpaacl.n ++++ b/man/mann/xpaacl.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpaacl n" +-.TH xpaacl n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpaacl 7" ++.TH xpaacl 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpacode.n ++++ b/man/mann/xpacode.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpacode n" +-.TH xpacode n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpacode 7" ++.TH xpacode 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpacommon.n ++++ b/man/mann/xpacommon.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpacommon n" +-.TH xpacommon n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpacommon 7" ++.TH xpacommon 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpaconvert.n ++++ b/man/mann/xpaconvert.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpaconvert n" +-.TH xpaconvert n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpaconvert 7" ++.TH xpaconvert 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpaenv.n ++++ b/man/mann/xpaenv.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpaenv n" +-.TH xpaenv n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpaenv 7" ++.TH xpaenv 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +@@ -471,12 +471,3 @@ + .SH "SEE ALSO" + .IX Header "SEE ALSO" + See xpa(n) for a list of \s-1XPA\s0 help pages +-.SH "POD ERRORS" +-.IX Header "POD ERRORS" +-Hey! \fBThe above document had some coding errors, which are explained below:\fR +-.IP "Around line 458:" 4 +-.IX Item "Around line 458:" +-\&'=item' outside of any '=over' +-.IP "Around line 509:" 4 +-.IX Item "Around line 509:" +-You forgot a '=back' before '=head1' +--- a/man/mann/xpainet.n ++++ b/man/mann/xpainet.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpainet n" +-.TH xpainet n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpainet 7" ++.TH xpainet 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpaintro.n ++++ b/man/mann/xpaintro.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpaintro n" +-.TH xpaintro n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpaintro 7" ++.TH xpaintro 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpamethod.n ++++ b/man/mann/xpamethod.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpamethod n" +-.TH xpamethod n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpamethod 7" ++.TH xpamethod 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpaname.n ++++ b/man/mann/xpaname.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpaname n" +-.TH xpaname n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpaname 7" ++.TH xpaname 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpaoom.n ++++ b/man/mann/xpaoom.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpaoom n" +-.TH xpaoom n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpaoom 7" ++.TH xpaoom 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpatcl.n ++++ b/man/mann/xpatcl.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpatcl n" +-.TH xpatcl n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpa 3tcl" ++.TH xpa 3tcl "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpatemplate.n ++++ b/man/mann/xpatemplate.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpatemplate n" +-.TH xpatemplate n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpatemplate 7" ++.TH xpatemplate 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpausers.n ++++ b/man/mann/xpausers.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpausers n" +-.TH xpausers n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpausers 7" ++.TH xpausers 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +--- a/man/mann/xpaxt.n ++++ b/man/mann/xpaxt.n +@@ -123,8 +123,8 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "xpaxt n" +-.TH xpaxt n "July 23, 2013" "version 2.1.15" "SAORD Documentation" ++.IX Title "xpaxt 7" ++.TH xpaxt 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l diff --git a/patches/fix_paths.patch b/patches/fix_paths.patch new file mode 100644 index 0000000..33e4acc --- /dev/null +++ b/patches/fix_paths.patch @@ -0,0 +1,67 @@ +Author: Ole Streicher +Description: Fix the paths for a chroot build and for FHS +--- a/Makefile.in ++++ b/Makefile.in +@@ -34,7 +34,7 @@ + # to be different than those used for actually reference files at + # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix + # when installing files. +-INSTALL_ROOT = ++INSTALL_ROOT = $(DESTDIR) + + # Directory in which to install the .a or .so binary for the XPA library: + LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib +@@ -46,7 +46,7 @@ + INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include + + # Top-level directory for manual entries: +-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man ++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/share/man + + # Top-level directory for share entries: + MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa +@@ -273,7 +273,7 @@ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +- mkdir $$i; \ ++ mkdir -p $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ +@@ -295,14 +295,22 @@ + install-man: + @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ + echo "Making directory $(MAN_INSTALL_DIR)"; \ +- mkdir $(MAN_INSTALL_DIR); \ ++ mkdir -p $(MAN_INSTALL_DIR); \ + chmod 755 $(MAN_INSTALL_DIR); \ + else true; \ + fi; + @-(for i in `ls ./man/man?/*.?` ; \ + do \ +- B=`basename $$i`; \ +- E=`echo $$i | awk -F. '{print $$NF}'`; \ ++ B=`basename $$i | sed s/\\\\.n/.7/`; \ ++ E=`echo $$i | awk -F. '{print $$NF}' | sed s/n/7/`; \ ++ case $$B in \ ++ xpatcl.7) \ ++ B=xpa.3tcl; \ ++ E=3;; \ ++ xpachanges.1) \ ++ B=xpachanges.7; \ ++ E=7;; \ ++ esac; \ + M="$(MAN_INSTALL_DIR)/man$$E"; \ + if [ ! -d $$M ] ; then \ + echo "Making directory $$M"; \ +@@ -312,6 +320,9 @@ + fi; \ + echo "Installing $$B" ; \ + $(INSTALL_DATA) $$i $$M/$$B; \ ++ sed -i "s/\([-\[ \"]\)\(-[A-Za-z0-9]\)/\1\\\\\2/g" $$M/$$B ; \ ++ sed -i "s/^\\\&\\\fB\(.*\):\(.*\)\\\fR/\1 \- \2/g" $$M/$$B ; \ ++ sed -i "s/xpa(n)/xpa(7)/g" $$M/$$B ; \ + done;) + + install-share: diff --git a/patches/fix_xpa_h.patch b/patches/fix_xpa_h.patch new file mode 100644 index 0000000..4e1be8c --- /dev/null +++ b/patches/fix_xpa_h.patch @@ -0,0 +1,31 @@ +Author: Ole Streicher +Description: Remove conf.h include from xpa.h. + The missing file is included by a preprocessor switch. +Bug: https://bugs.debian.org/764406 +--- a/Makefile.in ++++ b/Makefile.in +@@ -122,9 +122,9 @@ + + CC = @CC@ + +-CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} ${AC_FLAGS} ++CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} ${AC_FLAGS} -include conf.h + +-DEPEND_SWITCHES = -I. ${CFLAGS} ${PKG_CFLAGS} ${AC_FLAGS} ++DEPEND_SWITCHES = -I. ${CFLAGS} ${PKG_CFLAGS} ${AC_FLAGS} -include conf.h + + SRCS = xpa.c xpaio.c command.c acl.c remote.c clipboard.c port.c \ + tcp.c client.c word.c xalloc.c find.c xlaunch.c timedconn.c \ +--- a/xpa.h ++++ b/xpa.h +@@ -11,10 +11,6 @@ + #ifndef __xpa_h + #define __xpa_h + +-#if HAVE_CONFIG_H +-#include +-#endif +- + #include + #include + #include diff --git a/patches/hardening.patch b/patches/hardening.patch new file mode 100644 index 0000000..e27eef2 --- /dev/null +++ b/patches/hardening.patch @@ -0,0 +1,31 @@ +Author: Ole Streicher +Description: Add hardening flags +--- a/Makefile.in ++++ b/Makefile.in +@@ -122,7 +122,7 @@ + + CC = @CC@ + +-CC_SWITCHES = -I. ${CFLAGS} ${AC_FLAGS} ++CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} ${AC_FLAGS} + + DEPEND_SWITCHES = -I. ${CFLAGS} ${PKG_CFLAGS} ${AC_FLAGS} + +@@ -183,7 +183,7 @@ + rm -f lib$(PACKAGE).tmp/xt*.o; \ + rm -f lib$(PACKAGE).tmp/tcl*.o; \ + CC='$(CC)' CXX=$(CXX) \ +- ./mklib -o $(PACKAGE) lib$(PACKAGE).tmp/*.o; \ ++ ./mklib -ldflags "$(LDFLAGS)" -o $(PACKAGE) lib$(PACKAGE).tmp/*.o; \ + rm -rf lib$(PACKAGE).tmp) + + mingw-dll: $(LIBOBJS) +@@ -202,7 +202,7 @@ + @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ + (cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \ + CC='$(CC)' CXX='$(CXX)' \ +- ./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \ ++ ./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \ + rm -rf $(PACKAGE)tmp; ) + + diff: diff --git a/patches/install_tclxpa.patch b/patches/install_tclxpa.patch new file mode 100644 index 0000000..ebbaa38 --- /dev/null +++ b/patches/install_tclxpa.patch @@ -0,0 +1,98 @@ +Author: Ole Streicher +Description: Install the tcl interface to /usr/lib/tcltk/xpa according to + Debians policy. +--- a/Makefile.in ++++ b/Makefile.in +@@ -38,6 +38,7 @@ + + # Directory in which to install the .a or .so binary for the XPA library: + LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib ++TCL_LIB_INSTALL_DIR = $(LIB_INSTALL_DIR)/tcltk/xpa + + # Directory in which to install the program wish: + BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin +@@ -142,7 +143,7 @@ + INCL = xpa.h xpap.h + + # these are all the modules going into the "normal" xpa library +-LIBOBJS = ${BASE_OBJS} ${TCL_OBJS} ${XT_OBJS} ${GTK_OBJS} ++LIBOBJS = ${BASE_OBJS} ${XT_OBJS} ${GTK_OBJS} + LIB = libxpa.a + + # used in link line +@@ -167,6 +168,8 @@ + + install:: install-share + ++install:: tclxpa_install ++ + lib: $(LIB) $(DOSHARED) + + $(LIB): $(LIBOBJS) +@@ -190,14 +193,17 @@ + -Wl,--output-def,libxpa.def,--out-implib,libxpa_dll.a,-no-undefined,--enable-runtime-pseudo-reloc -o libxpa.dll \ + -lwsock32 + +-tclxpa: $(LIB) +- @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \ +- (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ +- rm -f libtclxpa.tmp/xt*.o; \ +- CC='$(CC)' CXX=$(CXX) \ +- ./mklib -o tclxpa libtclxpa.tmp/*.o $(TCL_LIBS); \ +- test -r libtclxpa.dylib && cp -p libtclxpa.dylib libtclxpa.so && echo "copying libtclxpa.dylib to libtclxpa.so"; \ +- rm -rf libtclxpa.tmp) ++ ++tclxpa: $(TCL_OBJS) ++ ar cruv libtclxpa.a $(TCL_OBJS) ++ $(RANLIB) libtclxpa.a ++ ++shtclxpa: tclxpa ++ @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ ++ (cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \ ++ CC='$(CC)' CXX='$(CXX)' \ ++ ./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \ ++ rm -rf $(PACKAGE)tmp; ) + + diff: + -(for f in `ls *.c`; \ +@@ -256,7 +262,7 @@ + _install: + + shlib_install: +- @-(for i in `ls *.so* *.dylib *.sl 2>/dev/null` ; \ ++ @-(for i in `ls libxpa.so* *.dylib *.sl 2>/dev/null` ; \ + do \ + if [ -h $$i ] ; then \ + echo "Installing link $$i" ; \ +@@ -268,6 +274,11 @@ + fi; \ + done;) + ++tclxpa_install: shtclxpa ++ mkdir -p $(TCL_LIB_INSTALL_DIR) ++ $(INSTALL_DATA) libtclxpa.so $(TCL_LIB_INSTALL_DIR) ++ $(INSTALL_DATA) pkgIndex.tcl $(TCL_LIB_INSTALL_DIR) ++ + install-binaries: $(LIB) $(PROGS) + @for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ + do \ +--- a/tcl.c ++++ b/tcl.c +@@ -971,7 +971,7 @@ + /* create new tcl variable for this socket */ + else{ + /* create a tcl channel corresponding to the xpa socket */ +- if( !(chan = Tcl_MakeTcpClientChannel((ClientData)xpa_cmdfd(xpa))) ){ ++ if( !(chan = Tcl_MakeTcpClientChannel((ClientData)(intptr_t)xpa_cmdfd(xpa))) ){ + Tcl_SetResult(interp, "XPA$ERROR: could not map XPA cmdfd to tcl", + TCL_STATIC); + result = TCL_ERROR; +@@ -1013,7 +1013,7 @@ + } + /* create new tcl variable for this socket */ + else{ +- if( !(chan = Tcl_MakeTcpClientChannel((ClientData)xpa_datafd(xpa))) ){ ++ if( !(chan = Tcl_MakeTcpClientChannel((ClientData)(intptr_t)xpa_datafd(xpa))) ){ + Tcl_SetResult(interp, "XPA$ERROR: could not map XPA datafd to tcl", + TCL_STATIC); + result = TCL_ERROR; diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..4600dba --- /dev/null +++ b/patches/series @@ -0,0 +1,5 @@ +fix_paths.patch +fix_manpages.patch +install_tclxpa.patch +hardening.patch +fix_xpa_h.patch diff --git a/rules b/rules new file mode 100755 index 0000000..e556fc5 --- /dev/null +++ b/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ --with autotools_dev + +override_dh_auto_configure: + dh_auto_configure -- --enable-shared --with-threads --with-tclconfig=/usr/lib --with-tcl=/usr/include/tcl + +override_dh_auto_build: + dh_auto_build -- all tclxpa + +override_dh_installchangelogs: + dh_installchangelogs doc/changelog.html + for pkg in tcl-xpa libxpa1 xpa-tools ; do \ + rm -f debian/$$pkg/usr/share/doc/$$pkg/changelog.html; \ + done + +override_dh_compress: + dh_compress -Xchangelog.html + +override_dh_makeshlibs: + dh_makeshlibs -Xlibtclxpa.so diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/tcl-xpa.install b/tcl-xpa.install new file mode 100644 index 0000000..b5344da --- /dev/null +++ b/tcl-xpa.install @@ -0,0 +1,3 @@ +usr/lib/tcltk/xpa/libtclxpa.so +usr/lib/tcltk/xpa/pkgIndex.tcl +usr/share/man/man3/xpa.3tcl diff --git a/watch b/watch new file mode 100644 index 0000000..1d3d1a9 --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=3 +http://hea-www.harvard.edu/RD/xpa/ http://hea-www.harvard.edu/saord/download/xpa/xpa-(.+)\.tar\.gz diff --git a/xpa-tools.install b/xpa-tools.install new file mode 100644 index 0000000..403a203 --- /dev/null +++ b/xpa-tools.install @@ -0,0 +1,12 @@ +usr/bin/xpaaccess +usr/bin/xpaget +usr/bin/xpainfo +usr/bin/xpamb +usr/bin/xpans +usr/bin/xpaset +usr/share/man/man1/xpaaccess.1 +usr/share/man/man1/xpaget.1 +usr/share/man/man1/xpainfo.1 +usr/share/man/man1/xpamb.1 +usr/share/man/man1/xpans.1 +usr/share/man/man1/xpaset.1 -- 2.30.2