Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ckermit/, app-misc/ckermit/files/
Date: Fri, 04 Jan 2019 05:12:22
Message-Id: 1546578703.43138c41b9334e85b5e80508eda81cdeecf0d4b6.radhermit@gentoo
1 commit: 43138c41b9334e85b5e80508eda81cdeecf0d4b6
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 4 05:08:29 2019 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 4 05:11:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43138c41
7
8 app-misc/ckermit: version bump to 9.0.302
9
10 Closes: https://bugs.gentoo.org/408335
11 Closes: https://bugs.gentoo.org/669332
12
13 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
14
15 app-misc/ckermit/Manifest | 1 +
16 app-misc/ckermit/ckermit-9.0.302.ebuild | 76 +++++++++++++++++
17 .../ckermit/files/ckermit-9.0.302-cleanup.patch | 94 ++++++++++++++++++++++
18 3 files changed, 171 insertions(+)
19
20 diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
21 index 8b5eb782833..af4966e9a0c 100644
22 --- a/app-misc/ckermit/Manifest
23 +++ b/app-misc/ckermit/Manifest
24 @@ -1 +1,2 @@
25 DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
26 +DIST cku302.tar.gz 3122219 BLAKE2B 9f63261da2dc2b0fceb0af0fa81da63c87e68b7bf713037cf8675abeb81716fd0dd4cd1f84324562698d9b9126f26b8a651dc79deec37a056fa1047af2d9966e SHA512 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
27
28 diff --git a/app-misc/ckermit/ckermit-9.0.302.ebuild b/app-misc/ckermit/ckermit-9.0.302.ebuild
29 new file mode 100644
30 index 00000000000..8c7e12e0f40
31 --- /dev/null
32 +++ b/app-misc/ckermit/ckermit-9.0.302.ebuild
33 @@ -0,0 +1,76 @@
34 +# Copyright 1999-2019 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI="7"
38 +
39 +inherit flag-o-matic toolchain-funcs
40 +
41 +# Columbia University only uses the third component, e.g. cku211.tar.gz for
42 +# what we would call 8.0.211.
43 +MY_P="cku$(ver_cut 3)"
44 +
45 +DESCRIPTION="combined serial and network communication software package"
46 +SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
47 +HOMEPAGE="http://www.kermitproject.org/"
48 +
49 +LICENSE="Kermit"
50 +SLOT="0"
51 +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
52 +IUSE="ncurses"
53 +
54 +DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
55 +RDEPEND="${DEPEND}
56 + net-dialup/lrzsz"
57 +
58 +S=${WORKDIR}
59 +
60 +PATCHES=(
61 + "${FILESDIR}"/${P}-cleanup.patch
62 + "${FILESDIR}"/${PN}-8.0.211-build-wart.patch
63 +)
64 +
65 +src_prepare() {
66 + default
67 +
68 + tc-export_build_env BUILD_CC
69 + sed -i -r \
70 + -e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
71 + -e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
72 + makefile || die
73 +}
74 +
75 +src_compile() {
76 + # we don't enable any of the telnet/ftp authentication stuff
77 + # since there are other packages which do these things better
78 + # USE="kerberos pam shadow ssl zlib"
79 + append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
80 +
81 + if use ncurses; then
82 + append-cppflags "-DCK_NCURSES"
83 + append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
84 + append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
85 + fi
86 +
87 + append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
88 + append-cppflags -DHAVE_CRYPT_H -DHAVE_OPENPTY
89 + append-cppflags -DNOARROWKEYS # bug #669332
90 + emake \
91 + CC="$(tc-getCC)" \
92 + KFLAGS="${CPPFLAGS}" \
93 + LIBS="-lcrypt -lresolv -lutil ${LIBS}" \
94 + LNKFLAGS="${LDFLAGS}" \
95 + linuxa
96 +}
97 +
98 +src_install() {
99 + emake DESTDIR="${ED}" prefix=/usr manroot=/usr/share install
100 + dodoc *.txt
101 +
102 + # make the correct symlink
103 + rm "${ED}"/usr/bin/kermit-sshsub || die
104 + dosym kermit /usr/bin/kermit-sshsub
105 +
106 + # the ckermit.ini script is calling the wrong kermit binary --
107 + # the one from ${D}
108 + sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
109 +}
110
111 diff --git a/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch b/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch
112 new file mode 100644
113 index 00000000000..c645e75da83
114 --- /dev/null
115 +++ b/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch
116 @@ -0,0 +1,94 @@
117 +Various clean-ups and fix makefile dir creation.
118 +
119 +--- cku302/ckcmai.c
120 ++++ cku302/ckcmai.c
121 +@@ -561,6 +561,8 @@
122 + #include "ckntap.h"
123 + #endif /* NT */
124 +
125 ++#include <time.h>
126 ++
127 + #ifndef NOSERVER
128 + /* Text message definitions.. each should be 256 chars long, or less. */
129 + #ifdef MINIX
130 +--- cku302/ckuus5.c
131 ++++ cku302/ckuus5.c
132 +@@ -7853,7 +7853,7 @@
133 + printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)");
134 + printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)");
135 + printf(" --cdmessage:%d\n",srvcdmsg);
136 +- printf(" --helpfile:%d\n",helpfile);
137 ++ printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)");
138 + if (inserver) {
139 + printf("\n");
140 + break;
141 +--- cku302/ckuusx.c
142 ++++ cku302/ckuusx.c
143 +@@ -57,7 +57,6 @@
144 + #include <termcap.h>
145 + #endif /* NOHTERMCAP */
146 + #endif /* BSD44 */
147 +-#else /* !BSD44 */
148 + #ifdef linux
149 + #include <term.h>
150 + #endif /* linux */
151 +--- cku302/makefile
152 ++++ cku302/makefile
153 +@@ -1047,7 +1047,7 @@
154 + else\
155 + echo "Creating $(DESTDIR)...";\
156 + DESTDIR=`echo $(DESTDIR) | sed 's!/*$$!!'`;\
157 +- mkdir $$DESTDIR || exit 1;\
158 ++ mkdir -p $$DESTDIR || exit 1;\
159 + fi;\
160 + chmod 755 $(DESTDIR) || exit 1;\
161 + fi;\
162 +@@ -1066,7 +1066,7 @@
163 + echo "$(DESTDIR)$(BINDIR) exists...";\
164 + else\
165 + echo "Creating $(DESTDIR)$(BINDIR)/...";\
166 +- mkdir $(DESTDIR)$(BINDIR) || exit 1;\
167 ++ mkdir -p $(DESTDIR)$(BINDIR) || exit 1;\
168 + chmod 755 $(DESTDIR)$(BINDIR);\
169 + fi;\
170 + rm -f $(DESTDIR)$(BINDIR)/kermit;\
171 +@@ -1104,9 +1104,9 @@
172 + if test -d $(DESTDIR)$(MANDIR); then\
173 + echo "$(DESTDIR)$(MANDIR) exists...";\
174 + else\
175 +- echo "Creating $(MANDIR)...";\
176 +- mkdir $(MANDIR) || exit 1;\
177 +- chmod 755 $(MANDIR) || exit 1;\
178 ++ echo "Creating $(DESTDIR)$(MANDIR)...";\
179 ++ mkdir -p $(DESTDIR)$(MANDIR) || exit 1;\
180 ++ chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
181 + fi;\
182 + rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
183 + cp ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
184 +@@ -1125,7 +1125,7 @@
185 + echo "$(CERTDIR) exists...";\
186 + else\
187 + echo "Creating $(CERTDIR)...";\
188 +- mkdir $(CERTDIR) || exit 1;\
189 ++ mkdir -p $(CERTDIR) || exit 1;\
190 + chmod 755 $(CERTDIR) || exit 1;\
191 + fi;\
192 + echo "Installing certificates file...";\
193 +@@ -1146,7 +1146,7 @@
194 + echo "$(DESTDIR)$(SRCDIR) exists...";\
195 + else\
196 + echo "Creating $(DESTDIR)$(SRCDIR)/...";\
197 +- mkdir $(DESTDIR)$(SRCDIR) || exit 1;\
198 ++ mkdir -p $(DESTDIR)$(SRCDIR) || exit 1;\
199 + chmod 755 $(DESTDIR)$(SRCDIR);\
200 + fi;\
201 + echo "Copying source files to $(DESTDIR)$(SRCDIR)...";\
202 +@@ -1168,7 +1168,7 @@
203 + echo "$(DESTDIR)$(INFODIR) exists...";\
204 + else\
205 + echo "Creating $(DESTDIR)$(INFODIR)/...";\
206 +- mkdir $(DESTDIR)$(INFODIR) || exit 1;\
207 ++ mkdir -p $(DESTDIR)$(INFODIR) || exit 1;\
208 + chmod 755 $(DESTDIR)$(INFODIR);\
209 + fi;\
210 + echo "Copying text files to $(DESTDIR)$(INFODIR)...";\