Changes 2.5: * Handle device reconnected more smoothly (USB-serial dongles) * Translation updates: Danish * Several fixes (see ChangeLog) Changes 2.4: * Add -D and -b options to specify device and baud rate on the command line. * Do character conversion between local and remote side (-R option) * Added indonesian translation * Compatibility fixes for recent build environments * Remove code that handled very old systems Changes 2.3: * Fix build on Mac OS X * New version of the dial format to be little and big endian as well as 32/64 bit safe * Support more baud rates * Handle device disappearances (e.g. serial-USB device unplug) * Various build and other fixes Changes 2.2: * Vietnamese translation added * Norwegian translation added * Traditional chinese translation added * Swedish translation added * Romanian translation added * default to 8bit mode if LANG or LC_ALL are set * default baud rate set to 115200 * Various code cleanups and fixesdiff -r1.58 -r1.59 pkgsrc/comms/minicom/Makefile
(adam)
@@ -1,52 +1,46 @@ | @@ -1,52 +1,46 @@ | |||
1 | # $NetBSD: Makefile,v 1.58 2011/04/22 13:43:10 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.59 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= minicom-2.1 | 3 | DISTNAME= minicom-2.5 | |
4 | PKGREVISION= 4 | |||
5 | CATEGORIES= comms | 4 | CATEGORIES= comms | |
6 | MASTER_SITES= http://alioth.debian.org/download.php/123/ | 5 | MASTER_SITES= http://alioth.debian.org/frs/download.php/3487/ | |
7 | 6 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://alioth.debian.org/projects/minicom/ | 8 | HOMEPAGE= http://alioth.debian.org/projects/minicom/ | |
10 | COMMENT= MS-DOS Telix serial communication program "workalike" | 9 | COMMENT= MS-DOS Telix serial communication program "workalike" | |
10 | LICENSE= gnu-gpl-v2 | |||
11 | 11 | |||
12 | DEPENDS+= gkermit-[0-9]*:../../comms/gkermit | 12 | DEPENDS+= gkermit-[0-9]*:../../comms/gkermit | |
13 | DEPENDS+= lrzsz-[0-9]*:../../comms/lrzsz | 13 | DEPENDS+= lrzsz-[0-9]*:../../comms/lrzsz | |
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 16 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
17 | INSTALLATION_DIRS= share/examples/minicom | 17 | INSTALLATION_DIRS= share/examples/minicom | |
18 | 18 | |||
19 | USE_PKGLOCALEDIR= yes | 19 | USE_PKGLOCALEDIR= yes | |
20 | USE_TOOLS+= gmake msgfmt | 20 | USE_TOOLS+= gmake msgfmt | |
21 | GNU_CONFIGURE= yes | 21 | GNU_CONFIGURE= yes | |
22 | 22 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | ||
23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | |||
24 | 23 | |||
25 | PKG_SYSCONFSUBDIR= minicom | 24 | PKG_SYSCONFSUBDIR= minicom | |
26 | EGDIR= ${PREFIX}/share/examples/minicom | 25 | EGDIR= ${PREFIX}/share/examples/minicom | |
27 | 26 | |||
28 | PKG_GROUPS= ${DIALER_GROUP} | 27 | PKG_GROUPS= ${DIALER_GROUP} | |
29 | PKG_USERS= ${UUCP_USER}:${UUCP_GROUP} | 28 | PKG_USERS= ${UUCP_USER}:${UUCP_GROUP} | |
30 | ||||
31 | PKG_GROUPS_VARS+= DIALER_GROUP UUCP_GROUP | 29 | PKG_GROUPS_VARS+= DIALER_GROUP UUCP_GROUP | |
32 | PKG_USERS_VARS+= UUCP_USER | 30 | PKG_USERS_VARS= UUCP_USER | |
33 | 31 | |||
34 | SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555 | 32 | SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555 | |
35 | OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755 | 33 | OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755 | |
36 | CONF_FILES_PERMS= ${EGDIR}/minicom.users ${PKG_SYSCONFDIR}/minicom.users \ | |||
37 | ${UUCP_USER} ${DIALER_GROUP} 0644 | |||
38 | 34 | |||
39 | EVAL_PREFIX+= GKERMIT_PREFIX=gkermit | 35 | EVAL_PREFIX+= GKERMIT_PREFIX=gkermit | |
40 | EVAL_PREFIX+= LRZSZ_PREFIX=lrzsz | 36 | EVAL_PREFIX+= LRZSZ_PREFIX=lrzsz | |
41 | 37 | |||
42 | SUBST_CLASSES+= minicom | 38 | SUBST_CLASSES+= minicom | |
43 | SUBST_MESSAGE.minicom= Fixing hardcoded paths. | 39 | SUBST_MESSAGE.minicom= Fixing hardcoded paths. | |
44 | SUBST_STAGE.minicom= post-patch | 40 | SUBST_STAGE.minicom= post-patch | |
45 | SUBST_FILES.minicom= src/rwconf.c | 41 | SUBST_FILES.minicom= src/rwconf.c | |
46 | SUBST_VARS.minicom= PREFIX GKERMIT_PREFIX LRZSZ_PREFIX | 42 | SUBST_VARS.minicom= PREFIX GKERMIT_PREFIX LRZSZ_PREFIX | |
47 | 43 | |||
48 | post-install: | 44 | .include "../../converters/libiconv/buildlink3.mk" | |
49 | ${INSTALL_DATA} ${WRKSRC}/doc/minicom.users ${DESTDIR}${EGDIR} | |||
50 | ||||
51 | .include "../../devel/gettext-lib/buildlink3.mk" | 45 | .include "../../devel/gettext-lib/buildlink3.mk" | |
52 | .include "../../mk/bsd.pkg.mk" | 46 | .include "../../mk/bsd.pkg.mk" |
@@ -1,19 +1,27 @@ | @@ -1,19 +1,27 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.11 2009/11/16 10:39:10 obache Exp $ | 1 | @comment $NetBSD: PLIST,v 1.12 2011/08/01 09:30:33 adam Exp $ | |
2 | bin/ascii-xfr | 2 | bin/ascii-xfr | |
3 | bin/minicom | 3 | bin/minicom | |
4 | bin/runscript | 4 | bin/runscript | |
5 | bin/xminicom | 5 | bin/xminicom | |
6 | man/man1/ascii-xfr.1 | 6 | man/man1/ascii-xfr.1 | |
7 | man/man1/minicom.1 | 7 | man/man1/minicom.1 | |
8 | man/man1/runscript.1 | 8 | man/man1/runscript.1 | |
9 | man/man1/xminicom.1 | 9 | man/man1/xminicom.1 | |
10 | share/examples/minicom/minicom.users | |||
11 | share/locale/cs/LC_MESSAGES/minicom.mo | 10 | share/locale/cs/LC_MESSAGES/minicom.mo | |
11 | share/locale/da/LC_MESSAGES/minicom.mo | |||
12 | share/locale/de/LC_MESSAGES/minicom.mo | |||
12 | share/locale/es/LC_MESSAGES/minicom.mo | 13 | share/locale/es/LC_MESSAGES/minicom.mo | |
13 | share/locale/fi/LC_MESSAGES/minicom.mo | 14 | share/locale/fi/LC_MESSAGES/minicom.mo | |
14 | share/locale/fr/LC_MESSAGES/minicom.mo | 15 | share/locale/fr/LC_MESSAGES/minicom.mo | |
15 | share/locale/hu/LC_MESSAGES/minicom.mo | 16 | share/locale/hu/LC_MESSAGES/minicom.mo | |
17 | share/locale/id/LC_MESSAGES/minicom.mo | |||
16 | share/locale/ja/LC_MESSAGES/minicom.mo | 18 | share/locale/ja/LC_MESSAGES/minicom.mo | |
19 | share/locale/nb/LC_MESSAGES/minicom.mo | |||
17 | share/locale/pl/LC_MESSAGES/minicom.mo | 20 | share/locale/pl/LC_MESSAGES/minicom.mo | |
18 | share/locale/pt_BR/LC_MESSAGES/minicom.mo | 21 | share/locale/pt_BR/LC_MESSAGES/minicom.mo | |
22 | share/locale/ro/LC_MESSAGES/minicom.mo | |||
19 | share/locale/ru/LC_MESSAGES/minicom.mo | 23 | share/locale/ru/LC_MESSAGES/minicom.mo | |
24 | share/locale/rw/LC_MESSAGES/minicom.mo | |||
25 | share/locale/sv/LC_MESSAGES/minicom.mo | |||
26 | share/locale/vi/LC_MESSAGES/minicom.mo | |||
27 | share/locale/zh_TW/LC_MESSAGES/minicom.mo |
@@ -1,15 +1,12 @@ | @@ -1,15 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2009/08/24 08:14:36 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.11 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (minicom-2.1.tar.gz) = 720273f6ee8db5fb2da4379ac610a520a31aba70 | 3 | SHA1 (minicom-2.5.tar.gz) = 442250314de63189b619f8744c0669445e2cdd1d | |
4 | RMD160 (minicom-2.1.tar.gz) = 58121cf29991a92914acee855d6e86486c6d370d | 4 | RMD160 (minicom-2.5.tar.gz) = 4131b9ef37d25cf8f77a70fc4b4de32e7896cc23 | |
5 | Size (minicom-2.1.tar.gz) = 607939 bytes | 5 | Size (minicom-2.5.tar.gz) = 822499 bytes | |
6 | SHA1 (patch-aa) = a7c85609f9384ec7c0e5e950d6244f527b0876d1 | 6 | SHA1 (patch-aa) = 1ce591eb1f9969a8dd72194d10f69a1df77c35a7 | |
7 | SHA1 (patch-ab) = 4cfb8bc389f4052c08551651aa86f98d0e751028 | 7 | SHA1 (patch-ab) = db913d60191fd1b0830746019c6cc9c125069cfb | |
8 | SHA1 (patch-ac) = 91a2acce80d7d1815a29843b1de5e1acc172024a | 8 | SHA1 (patch-ac) = 6af60d8edb50f4cd10bc4b63a792cec2075ed6d5 | |
9 | SHA1 (patch-ad) = 31e09b2df1bb93e3ccbd9f400f6fb127726f6070 | 9 | SHA1 (patch-ad) = e57999876f690689d858aa07f5c122ea79bfd2f1 | |
10 | SHA1 (patch-ae) = b037623c4e3ee4cbc8c73c4b04c6b7f77c689d38 | 10 | SHA1 (patch-ae) = 1d3267fc666d857bbab05a542de6d3aa1ba53e14 | |
11 | SHA1 (patch-af) = 38905432b60a796742d43be1aed84ee2774bb222 | 11 | SHA1 (patch-ag) = cf6c551736feb77f7f714cb4ba8b9a787eac937d | |
12 | SHA1 (patch-ag) = c8947fb6693d2508d7caa79916142af346e27cdd | 12 | SHA1 (patch-ah) = dd014449e5de1ac3537d697c9e73416a64e8af3e | |
13 | SHA1 (patch-ah) = da65045ad1d02a7c005aba863a106472d05f5c1c | |||
14 | SHA1 (patch-ai) = 5a1ecdea3287dc4d0b1c71bb88656fb729522081 | |||
15 | SHA1 (patch-aj) = 56c537b245aa32f9b71c96d527bc83c88ec66005 |
@@ -1,20 +1,13 @@ | @@ -1,20 +1,13 @@ | |||
1 | $NetBSD: patch-aa,v 1.9 2005/06/19 11:34:45 veego Exp $ | 1 | $NetBSD: patch-aa,v 1.10 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | --- src/Makefile.am.orig 2003-04-30 00:03:22.000000000 +0200 | 3 | --- src/Makefile.in.orig 2011-01-29 11:45:05.000000000 +0000 | |
4 | +++ src/Makefile.am 2005-05-17 21:55:32.000000000 +0200 | 4 | +++ src/Makefile.in | |
5 | @@ -3,8 +3,6 @@ | 5 | @@ -247,7 +247,7 @@ confdir = @MINICOM_CONFDIR@ | |
6 | 6 | AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \ | ||
7 | bin_PROGRAMS = minicom runscript ascii-xfr @KEYSERV@ | 7 | -DLOCALEDIR=\"$(datadir)/locale\" | |
8 | ||||
9 | -bin_SCRIPTS = xminicom | |||
10 | - | |||
11 | minicom_SOURCES = minicom.c vt100.c config.c help.c updown.c \ | |||
12 | util.c dial.c window.c wkeys.c ipc.c \ | |||
13 | windiv.c sysdep1.c sysdep1_s.c sysdep2.c rwconf.c main.c \ | |||
14 | @@ -34,5 +32,5 @@ | |||
15 | ||||
16 | runscript_LDADD = @INTLLIBS@ | |||
17 | ||||
18 | -EXTRA_DIST = functions.c xminicom | |||
19 | +EXTRA_DIST = functions.c | |||
20 | 8 | |||
9 | -minicom_LDADD = @LIBINTL@ $(MINICOM_LIBPORT) | |||
10 | +minicom_LDADD = @LIBINTL@ $(MINICOM_LIBPORT) $(LIBICONV) | |||
11 | minicom_keyserv_LDADD = @LIBINTL@ $(MINICOM_LIBPORT) | |||
12 | runscript_LDADD = @LIBINTL@ $(MINICOM_LIBPORT) | |||
13 | EXTRA_DIST = functions.c |
@@ -1,11 +1,7 @@ | @@ -1,11 +1,7 @@ | |||
1 | $NetBSD: patch-ab,v 1.4 2005/06/19 11:34:45 veego Exp $ | 1 | $NetBSD: patch-ab,v 1.5 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | --- man/Makefile.am.orig 2003-03-30 22:49:40.000000000 +0200 | 3 | --- man/Makefile.am.orig 2009-12-12 15:47:47.000000000 +0000 | |
4 | +++ man/Makefile.am 2005-05-17 21:57:15.000000000 +0200 | 4 | +++ man/Makefile.am | |
5 | @@ -1,5 +1,5 @@ | 5 | @@ -1 +1 @@ | |
6 | AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0 | 6 | -dist_man_MANS = ascii-xfr.1 minicom.1 runscript.1 xminicom.1 | |
7 | 7 | +dist_man_MANS = ascii-xfr.1 minicom.1 runscript.1 | ||
8 | -man_MANS = ascii-xfr.1 minicom.1 runscript.1 xminicom.1 | |||
9 | +man_MANS = ascii-xfr.1 minicom.1 runscript.1 | |||
10 | ||||
11 | EXTRA_DIST = $(man_MANS) |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ac,v 1.5 2005/06/19 11:34:45 veego Exp $ | 1 | $NetBSD: patch-ac,v 1.6 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | --- src/updown.c.orig 2003-04-13 00:52:20.000000000 +0200 | 3 | --- src/updown.c.orig 2010-05-30 20:34:00.000000000 +0000 | |
4 | +++ src/updown.c 2005-05-17 20:33:24.000000000 +0200 | 4 | +++ src/updown.c | |
5 | @@ -245,7 +245,7 @@ | 5 | @@ -294,7 +294,7 @@ void updown(int what, int nr) | |
6 | do_log("%s", cmdline); /* jl 22.06.97 */ | 6 | do_log("%s", cmdline); /* jl 22.06.97 */ | |
7 | 7 | |||
8 | if (P_PFULL(g) == 'N') { | 8 | if (P_PFULL(g) == 'N') { | |
9 | - win = wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); | 9 | - win = mc_wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); | |
10 | + win = wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); | 10 | + win = mc_wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); | |
11 | snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g), | 11 | snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g), | |
12 | what == 'U' ? _("upload") : _("download")); | 12 | what == 'U' ? _("upload") : _("download")); | |
13 | wtitle(win, TMID, title); | 13 | mc_wtitle(win, TMID, title); |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: patch-ae,v 1.5 2005/07/11 17:29:16 veego Exp $ | 1 | $NetBSD: patch-ae,v 1.6 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | --- src/windiv.c.orig 2003-04-22 01:56:46.000000000 +0200 | 3 | --- src/windiv.c.orig 2003-04-22 01:56:46.000000000 +0200 | |
4 | +++ src/windiv.c 2005-06-29 07:03:12.000000000 +0200 | 4 | +++ src/windiv.c 2005-06-29 07:03:12.000000000 +0200 | |
5 | @@ -21,2 +21,3 @@ | 5 | @@ -22,2 +22,3 @@ | |
6 | 6 | |||
7 | +#include <sys/types.h> | 7 | +#include <sys/types.h> | |
8 | #include <dirent.h> | 8 | #include <dirent.h> |
@@ -1,41 +1,41 @@ | @@ -1,41 +1,41 @@ | |||
1 | $NetBSD: patch-ad,v 1.7 2007/06/19 21:46:40 jlam Exp $ | 1 | $NetBSD: patch-ad,v 1.8 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | --- src/rwconf.c.orig 2003-04-13 00:52:20.000000000 +0200 | 3 | --- src/rwconf.c.orig 2011-01-16 10:01:18.000000000 +0000 | |
4 | +++ src/rwconf.c 2005-06-19 10:57:52.000000000 +0200 | 4 | +++ src/rwconf.c | |
5 | @@ -80,27 +80,15 @@ | 5 | @@ -76,27 +76,15 @@ struct pars mpars[] = { | |
6 | { "", PUBLIC, "pname10" }, | 6 | { "", 0, "pname10" }, | |
7 | { "", PUBLIC, "pname11" }, | 7 | { "", 0, "pname11" }, | |
8 | { "", PUBLIC, "pname12" }, | 8 | { "", 0, "pname12" }, | |
9 | -#if defined(__linux__) || defined(__GNU__) | 9 | -#if defined(__linux__) || defined(__GNU__) | |
10 | - { "/usr/bin/sz -vv -b", PUBLIC, "pprog1" }, | 10 | - { "/usr/bin/sz -vv -b", 0, "pprog1" }, | |
11 | - { "/usr/bin/sb -vv", PUBLIC, "pprog2" }, | 11 | - { "/usr/bin/sb -vv", 0, "pprog2" }, | |
12 | - { "/usr/bin/sx -vv", PUBLIC, "pprog3" }, | 12 | - { "/usr/bin/sx -vv", 0, "pprog3" }, | |
13 | - { "/usr/bin/rz -vv -b -E", PUBLIC, "pprog4" }, | 13 | - { "/usr/bin/rz -vv -b -E", 0, "pprog4" }, | |
14 | - { "/usr/bin/rb -vv", PUBLIC, "pprog5" }, | 14 | - { "/usr/bin/rb -vv", 0, "pprog5" }, | |
15 | - { "/usr/bin/rx -vv", PUBLIC, "pprog6" }, | 15 | - { "/usr/bin/rx -vv", 0, "pprog6" }, | |
16 | - { "/usr/bin/kermit -i -l %l -s", PUBLIC, "pprog7" }, | 16 | - { "/usr/bin/kermit -i -l %l -b %b -s", 0, "pprog7" }, | |
17 | - { "/usr/bin/kermit -i -l %l -r", PUBLIC, "pprog8" }, | 17 | - { "/usr/bin/kermit -i -l %l -b %b -r", 0, "pprog8" }, | |
18 | -#else | 18 | -#else | |
19 | - /* Most sites have this in /usr/local, except Linux. */ | 19 | - /* Most sites have this in /usr/local, except Linux. */ | |
20 | - { "/usr/local/bin/sz -vv", PUBLIC, "pprog1" }, | 20 | - { "/usr/local/bin/sz -vv", 0, "pprog1" }, | |
21 | - { "/usr/local/bin/sb -vv", PUBLIC, "pprog2" }, | 21 | - { "/usr/local/bin/sb -vv", 0, "pprog2" }, | |
22 | - { "/usr/local/bin/sx -vv", PUBLIC, "pprog3" }, | 22 | - { "/usr/local/bin/sx -vv", 0, "pprog3" }, | |
23 | - { "/usr/local/bin/rz -vv", PUBLIC, "pprog4" }, | 23 | - { "/usr/local/bin/rz -vv", 0, "pprog4" }, | |
24 | - { "/usr/local/bin/rb -vv", PUBLIC, "pprog5" }, | 24 | - { "/usr/local/bin/rb -vv", 0, "pprog5" }, | |
25 | - { "/usr/local/bin/rx -vv", PUBLIC, "pprog6" }, | 25 | - { "/usr/local/bin/rx -vv", 0, "pprog6" }, | |
26 | - { "/usr/local/bin/kermit -i -l %l -s", PUBLIC, "pprog7" }, | 26 | - { "/usr/local/bin/kermit -i -l %l -s", 0, "pprog7" }, | |
27 | - { "/usr/local/bin/kermit -i -l %l -r", PUBLIC, "pprog8" }, | 27 | - { "/usr/local/bin/kermit -i -l %l -r", 0, "pprog8" }, | |
28 | -#endif | 28 | -#endif | |
29 | - { "/usr/bin/ascii-xfr -dsv", PUBLIC, "pprog9" }, | 29 | - { "/usr/bin/ascii-xfr -dsv", 0, "pprog9" }, | |
30 | + { "@LRZSZ_PREFIX@/bin/lsz -vv -b", PUBLIC, "pprog1" }, | 30 | + { "@LRZSZ_PREFIX@/bin/lsz -vv", 0, "pprog1" }, | |
31 | + { "@LRZSZ_PREFIX@/bin/lsb -vv", PUBLIC, "pprog2" }, | 31 | + { "@LRZSZ_PREFIX@/bin/lsb -vv", 0, "pprog2" }, | |
32 | + { "@LRZSZ_PREFIX@/bin/lsx -vv", PUBLIC, "pprog3" }, | 32 | + { "@LRZSZ_PREFIX@/bin/lsx -vv", 0, "pprog3" }, | |
33 | + { "@LRZSZ_PREFIX@/bin/lrz -vv -b", PUBLIC, "pprog4" }, | 33 | + { "@LRZSZ_PREFIX@/bin/lrz -vv", 0, "pprog4" }, | |
34 | + { "@LRZSZ_PREFIX@/bin/lrb -vv", PUBLIC, "pprog5" }, | 34 | + { "@LRZSZ_PREFIX@/bin/lrb -vv", 0, "pprog5" }, | |
35 | + { "@LRZSZ_PREFIX@/bin/lrx -vv", PUBLIC, "pprog6" }, | 35 | + { "@LRZSZ_PREFIX@/bin/lrx -vv", 0, "pprog6" }, | |
36 | + { "@GKERMIT_PREFIX@/bin/gkermit -i -l %l -s", PUBLIC, "pprog7" }, | 36 | + { "@LRZSZ_PREFIX@/bin/gkermit -i -l %l -s", 0, "pprog7" }, | |
37 | + { "@GKERMIT_PREFIX@/bin/gkermit -i -l %l -r", PUBLIC, "pprog8" }, | 37 | + { "@LRZSZ_PREFIX@/bin/gkermit -i -l %l -r", 0, "pprog8" }, | |
38 | + { "@PREFIX@/bin/ascii-xfr -dsv", PUBLIC, "pprog9" }, | 38 | + { "@PREFIX@/bin/ascii-xfr -dsv", 0, "pprog9" }, | |
39 | { "", PUBLIC, "pprog10" }, | 39 | { "", 0, "pprog10" }, | |
40 | { "", PUBLIC, "pprog11" }, | 40 | { "", 0, "pprog11" }, | |
41 | { "", PUBLIC, "pprog12" }, | 41 | { "", 0, "pprog12" }, |
@@ -1,19 +1,16 @@ | @@ -1,19 +1,16 @@ | |||
1 | $NetBSD: patch-ag,v 1.3 2005/12/19 14:34:33 joerg Exp $ | 1 | $NetBSD: patch-ag,v 1.4 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | --- src/getsdir.c.orig 2005-12-19 14:23:45.000000000 +0000 | 3 | --- src/getsdir.c.orig 2009-12-12 15:47:47.000000000 +0000 | |
4 | +++ src/getsdir.c | 4 | +++ src/getsdir.c | |
5 | @@ -207,9 +207,14 @@ int *len; | 5 | @@ -185,7 +185,11 @@ int getsdir(const char *dirpath, const c | |
6 | int l; | 6 | int l; | |
7 | 7 | |||
8 | /* copy the filename */ | 8 | /* copy the filename */ | |
9 | +#ifdef NAME_MAX | 9 | +#ifdef NAME_MAX | |
10 | + strncpy(datb_cur->data[datb_cur->cnt].fname, | 10 | + strncpy(datb_cur->data[datb_cur->cnt].fname, dp->d_name, NAME_MAX); | |
11 | + dp->d_name, NAME_MAX); | |||
12 | +#else | 11 | +#else | |
13 | strncpy(datb_cur->data[datb_cur->cnt].fname, | 12 | strncpy(datb_cur->data[datb_cur->cnt].fname, dp->d_name, MAXNAMLEN); | |
14 | dp->d_name, | |||
15 | MAXNAMLEN); | |||
16 | +#endif | 13 | +#endif | |
17 | 14 | |||
18 | /* get information about the directory entry */ | 15 | /* get information about the directory entry */ | |
19 | snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name); | 16 | snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name); |
@@ -1,19 +1,16 @@ | @@ -1,19 +1,16 @@ | |||
1 | $NetBSD: patch-ah,v 1.1 2005/12/19 14:34:33 joerg Exp $ | 1 | $NetBSD: patch-ah,v 1.2 2011/08/01 09:30:33 adam Exp $ | |
2 | 2 | |||
3 | --- src/getsdir.h.orig 2005-12-19 14:24:44.000000000 +0000 | 3 | --- src/getsdir.h.orig 2009-12-12 15:47:47.000000000 +0000 | |
4 | +++ src/getsdir.h | 4 | +++ src/getsdir.h | |
5 | @@ -19,9 +19,14 @@ | 5 | @@ -25,7 +25,11 @@ | |
6 | */ | |||
7 | ||||
8 | #include <dirent.h> | 6 | #include <dirent.h> | |
9 | +#include <limits.h> | |||
10 | 7 | |||
11 | typedef struct dirEntry { /* structure of data item */ | 8 | typedef struct dirEntry { /* structure of data item */ | |
12 | +#ifdef NAME_MAX | 9 | +#ifdef NAME_MAX | |
13 | + char fname[NAME_MAX + 1]; | 10 | + char fname[NAME_MAX + 1]; | |
14 | +#else | 11 | +#else | |
15 | char fname[MAXNAMLEN + 1]; /* filename + terminating null */ | 12 | char fname[MAXNAMLEN + 1]; /* filename + terminating null */ | |
16 | +#endif | 13 | +#endif | |
17 | time_t time; /* last modification date */ | 14 | time_t time; /* last modification date */ | |
18 | mode_t mode; /* file mode (dir? etc.) */ | 15 | mode_t mode; /* file mode (dir? etc.) */ | |
19 | ushort cflags; /* caller field for convenience */ | 16 | ushort cflags; /* caller field for convenience */ |