Index: config/config.in =================================================================== RCS file: /cvsroot/dslinux/dslinux/config/config.in,v retrieving revision 1.28 diff -u -r1.28 config.in --- config/config.in 23 Oct 2006 21:11:05 -0000 1.28 +++ config/config.in 2 Nov 2006 18:29:16 -0000 @@ -595,6 +595,10 @@ fi bool 'thttpd' CONFIG_USER_THTTPD_THTTPD bool 'tinyirc' CONFIG_USER_TINYIRC_TINYIRC +bool 'tmsnc' CONFIG_USER_TMSNC_TMSNC +if [ "$CONFIG_USER_TMSNC_TMSNC" = "y" ]; then + define_bool CONFIG_LIB_LIBSSL y +fi bool 'traceroute' CONFIG_USER_TRACEROUTE_TRACEROUTE bool 'vconfig' CONFIG_USER_VCONFIG_VCONFIG Index: config/Configure.help =================================================================== RCS file: /cvsroot/dslinux/dslinux/config/Configure.help,v retrieving revision 1.19 diff -u -r1.19 Configure.help --- config/Configure.help 23 Oct 2006 21:11:05 -0000 1.19 +++ config/Configure.help 2 Nov 2006 18:29:18 -0000 @@ -1322,6 +1322,9 @@ CONFIG_USER_TINYIRC_TINYIRC Very tiny IRC client. +CONFIG_USER_TMSNC_TMSNC + Text mode MSN Messenger client. + CONFIG_USER_TRIPWIRE_TRIPWIRE The tripwire file modification detection utility. Index: user/Makefile =================================================================== RCS file: /cvsroot/dslinux/dslinux/user/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- user/Makefile 23 Oct 2006 21:11:05 -0000 1.21 +++ user/Makefile 2 Nov 2006 18:29:19 -0000 @@ -361,6 +361,7 @@ dir_$(CONFIG_USER_TINYTCL_TCLSH) += tinytcl dir_$(CONFIG_USER_TIP_TIP) += tip dir_$(CONFIG_USER_TIMEPEG_TPT) += tpt +dir_$(CONFIG_USER_TMSNC_TMSNC) += tmsnc dir_$(CONFIG_USER_TRACEROUTE_TRACEROUTE) += traceroute dir_$(CONFIG_USER_TRIPWIRE_SIGGEN) += tripwire dir_$(CONFIG_USER_TRIPWIRE_TRIPWIRE) += tripwire diff -uNr user/tmsnc-0.3.2/Makefile user/tmsnc/Makefile --- user/tmsnc-0.3.2/Makefile 2006-10-17 13:14:22.000000000 +0200 +++ user/tmsnc/Makefile 2006-11-02 19:04:53.000000000 +0100 @@ -1,591 +1,22 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# Makefile. Generated from Makefile.in by configure. +OBJECTS = src/misc.o src/main.o src/conf.o src/login.o src/sig.o src/menu.o \ +src/ui.o src/list.o src/charset.o src/core_misc.o src/core_net.o \ +src/core_ssl.o src/core_p2p.o src/dialog.o src/filters.o src/event.o \ +src/debug.o -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +EXEC = tmsnc -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. +CFLAGS += -g -I$(ROOTDIR)/lib/libncurses/include -DRENAMED_NCURSES +LDFLAGS += -lssl -lcrypto -lpanel -lform -lncurses +.PHONY: romfs clean -srcdir = . -top_srcdir = . +$(EXEC): $(OBJECTS) + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -pkgdatadir = $(datadir)/tmsnc -pkglibdir = $(libdir)/tmsnc -pkgincludedir = $(includedir)/tmsnc -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in \ - $(top_srcdir)/autopackage/default.apspec.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - config.guess config.rpath config.sub depcomp install-sh \ - missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/curses.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = autopackage/default.apspec -depcomp = -am__depfiles_maybe = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /home/jonas/tmsnc/missing --run aclocal-1.9 -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/jonas/tmsnc/missing --run tar -AUTOCONF = ${SHELL} /home/jonas/tmsnc/missing --run autoconf -AUTOHEADER = ${SHELL} /home/jonas/tmsnc/missing --run autoheader -AUTOMAKE = ${SHELL} /home/jonas/tmsnc/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CURSES_INCLUDEDIR = -CURSES_LIBS = -lncurses -lpanel -lform -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = /bin/grep -E -EXEEXT = -GREP = /bin/grep -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBICONV = -LIBOBJS = -LIBS = -LTLIBICONV = -LTLIBOBJS = -MAKEINFO = ${SHELL} /home/jonas/tmsnc/missing --run makeinfo -OBJEXT = o -OPENSSL_FALSE = # -OPENSSL_TRUE = -PACKAGE = tmsnc -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -SET_MAKE = -SHELL = /bin/sh -SSLINC = -SSLLIB = -lssl -lcrypto -STRIP = -TALKFILTERS_FALSE = -TALKFILTERS_TRUE = # -TFLIB = -VERSION = 0.3.2 -ac_ct_CC = gcc -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${datarootdir} -datarootdir = ${prefix}/share -docdir = ${datarootdir}/doc/${PACKAGE} -dvidir = ${docdir} -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -htmldir = ${docdir} -includedir = ${prefix}/include -infodir = ${datarootdir}/info -install_sh = /home/jonas/tmsnc/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localedir = ${datarootdir}/locale -localstatedir = ${prefix}/var -mandir = ${datarootdir}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -pdfdir = ${docdir} -prefix = /usr/local -program_transform_name = s,x,x, -psdir = ${docdir} -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -tmsnc_VERSION = 0.3.2 -AUTOMAKE_OPTIONS = no-dependencies -SUBDIRS = src doc -EXTRA_DIST = config.rpath mkinstalldirs m4/ChangeLog TODO README -ACLOCAL_AMFLAGS = -I m4 -all: all-recursive +$(OBJECTS): %.o: %.c %.h -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; +clean: + rm -f $(OBJECTS) $(EXEC) $(EXEC).gdb -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -autopackage/default.apspec: $(top_builddir)/config.status $(top_srcdir)/autopackage/default.apspec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/autopackage $(distdir)/m4 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: +romfs: + $(ROMFSINST) /bin/$(EXEC) diff -uNr user/tmsnc-0.3.2/src/config.h user/tmsnc/src/config.h --- user/tmsnc-0.3.2/src/config.h 2006-10-17 13:14:22.000000000 +0200 +++ user/tmsnc/src/config.h 2006-10-28 13:18:43.000000000 +0200 @@ -5,7 +5,7 @@ #define HAS_CURSES 1 /* Define if you have the iconv() function. */ -#define HAVE_ICONV 1 +/* #undef HAVE_ICONV */ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -59,7 +59,7 @@ /* #undef HAVE_WADD_WCH */ /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST +/* #undef ICONV_CONST */ /* If your curses does not have color define this one */ /* #undef NO_COLOR_CURSES */ diff -uNr user/tmsnc-0.3.2/src/core_net.c user/tmsnc/src/core_net.c --- user/tmsnc-0.3.2/src/core_net.c 2006-10-17 13:09:56.000000000 +0200 +++ user/tmsnc/src/core_net.c 2006-11-02 17:05:18.000000000 +0100 @@ -195,6 +195,7 @@ convert_to_utf8(str, strlen(str), conv_str, conv_size); #else strncpy(conv_str, str, strlen(str)); + conv_str[strlen(str)] = '\0'; #endif *csc++; diff -uNr user/tmsnc-0.3.2/src/debug.h user/tmsnc/src/debug.h --- user/tmsnc-0.3.2/src/debug.h 1970-01-01 01:00:00.000000000 +0100 +++ user/tmsnc/src/debug.h 2006-11-01 17:05:22.000000000 +0100 @@ -0,0 +1 @@ +/* debug.h - blank header to simplify the Makefile */ diff -uNr user/tmsnc-0.3.2/src/dialog.c user/tmsnc/src/dialog.c --- user/tmsnc-0.3.2/src/dialog.c 2006-10-17 13:09:56.000000000 +0200 +++ user/tmsnc/src/dialog.c 2006-10-28 13:18:53.000000000 +0200 @@ -125,6 +125,7 @@ break; case KEY_BACKSPACE: case 127: + case 8: if (dialog_ptr > 0) { dialog_ptr--; str_length--; diff -uNr user/tmsnc-0.3.2/src/event.c user/tmsnc/src/event.c --- user/tmsnc-0.3.2/src/event.c 2006-10-17 13:09:56.000000000 +0200 +++ user/tmsnc/src/event.c 2006-10-28 13:19:03.000000000 +0200 @@ -258,6 +258,7 @@ break; case KEY_BACKSPACE: case 127: /* Backspace in terminal.app */ + case 8: if (c_win->field_ptr > 0) { c_win->field_ptr--; c_win->field_length--; diff -uNr user/tmsnc-0.3.2/src/login.c user/tmsnc/src/login.c --- user/tmsnc-0.3.2/src/login.c 2006-10-17 13:09:56.000000000 +0200 +++ user/tmsnc/src/login.c 2006-10-28 13:19:20.000000000 +0200 @@ -32,8 +32,8 @@ mvwaddstr(statuswin, 1, 31, "ERROR"); mvwaddch(statuswin, 1, 2, '['); - mvwaddch(statuswin, 1, 65, ']'); - mvwaddstr(statuswin, 3, (70 - (strlen(str))) / 2, str); + mvwaddch(statuswin, 1, 55, ']'); + mvwaddstr(statuswin, 3, (60 - (strlen(str))) / 2, str); wrefresh(statuswin); } @@ -62,8 +62,8 @@ char *addr; char *pass; { - wins->field[0] = new_field(1, 46, 2, 2, 4, 0); - wins->field[1] = new_field(1, 46, 4, 2, 4, 0); + wins->field[0] = new_field(1, 36, 2, 2, 4, 0); + wins->field[1] = new_field(1, 36, 4, 2, 4, 0); wins->field[2] = NULL; /* @@ -94,10 +94,10 @@ int max_y; int max_x; { - wins->main = newwin(11, 70, (max_y - 11) / 2, (max_x - 70) / 2); + wins->main = newwin(11, 60, (max_y - 11) / 2, (max_x - 60) / 2); wins->main_panel = new_panel(wins->main); - wins->formwin = derwin(wins->main, 5, 48, 1, 20); - statuswin = derwin(wins->main, 4, 68, 6, 1); + wins->formwin = derwin(wins->main, 5, 38, 1, 10); + statuswin = derwin(wins->main, 4, 58, 6, 1); top_panel(wins->main_panel); refresh(); doupdate(); @@ -107,7 +107,7 @@ */ wins->form = new_form(wins->field); set_form_win(wins->form, wins->formwin); - set_form_sub(wins->form, derwin(wins->formwin, 5, 48, 0, 0)); + set_form_sub(wins->form, derwin(wins->formwin, 5, 38, 0, 0)); post_form(wins->form); wrefresh(wins->formwin); @@ -155,6 +155,7 @@ break; case KEY_BACKSPACE: case 127: /* Backspace in terminal.app */ + case 8: form_driver(form, REQ_PREV_CHAR); //Simulate backspace form_driver(form, REQ_DEL_CHAR); diff -uNr user/tmsnc-0.3.2/src/menu.h user/tmsnc/src/menu.h --- user/tmsnc-0.3.2/src/menu.h 2006-10-17 13:09:56.000000000 +0200 +++ user/tmsnc/src/menu.h 2006-11-02 18:54:45.000000000 +0100 @@ -48,7 +48,7 @@ INIT_MENU_ITEM("Set personal message", cmd_setpsm, 0), INIT_MENU_ITEM("Invite principal", cmd_invite, 0), INIT_MENU_ITEM("Set talkfilter", cmd_setfilter, 0), - INIT_MENU_ITEM("Redraw interface", cmd_redraw, 0), + /*INIT_MENU_ITEM("Redraw interface", cmd_redraw, 0),*/ END_ITEM, };