kftpgrabber-commits Mailing List for KFTPGrabber
Brought to you by:
kostko
Menu
▾
▴
kftpgrabber-commits — This mailing list contains all CVS commits by developers.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(19) |
Oct
(102) |
Nov
(62) |
Dec
(25) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(11) |
Feb
(36) |
Mar
(126) |
Apr
(90) |
May
(8) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Markus B. <mbr...@us...> - 2005-05-07 20:45:48
|
Update of /cvsroot/kftpgrabber/kftpgrabber In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28241 Removed Files: configure.files stamp-h.in subdirs Log Message: Remove autogenerated files --- stamp-h.in DELETED --- --- configure.files DELETED --- --- subdirs DELETED --- |
|
From: Markus B. <mbr...@us...> - 2005-05-07 20:33:29
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25107 Modified Files: Makefile.am Log Message: No need to hardcode OpenSSL libs anymore Index: Makefile.am =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/Makefile.am,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Makefile.am 14 Apr 2005 14:27:10 -0000 1.24 --- Makefile.am 7 May 2005 20:33:20 -0000 1.25 *************** *** 47,51 **** $(top_builddir)/src/ftp/libftp.a $(top_builddir)/src/misc/libkftpgrabbercore.a \ $(top_builddir)/src/ui/libui.a $(top_builddir)/src/misc/interfaces/libkftpinterfaces.la \ ! $(top_builddir)/src/misc/libs/ssh/libssh.a $(LIB_KDNSSD) $(QSA_LD) -lkwalletclient -lcrypto -lssl \ $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) -lkmdi $(LIB_QSA) $(LIB_KIMPROXY) --- 47,51 ---- $(top_builddir)/src/ftp/libftp.a $(top_builddir)/src/misc/libkftpgrabbercore.a \ $(top_builddir)/src/ui/libui.a $(top_builddir)/src/misc/interfaces/libkftpinterfaces.la \ ! $(top_builddir)/src/misc/libs/ssh/libssh.a $(LIB_KDNSSD) $(QSA_LD) -lkwalletclient $(LIBSSL) \ $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) -lkmdi $(LIB_QSA) $(LIB_KIMPROXY) |
|
From: Markus B. <mbr...@us...> - 2005-05-07 20:32:55
|
Update of /cvsroot/kftpgrabber/kftpgrabber In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24725 Modified Files: configure.in.in Log Message: Increase the level of portability by replacing the OpenSSL check by the one that KDE provides. Index: configure.in.in =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/configure.in.in,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** configure.in.in 6 May 2005 11:45:00 -0000 1.26 --- configure.in.in 7 May 2005 20:32:42 -0000 1.27 *************** *** 3,51 **** AM_INIT_AUTOMAKE(kftpgrabber, 0.6.0-beta2) - AC_DEFUN([PKG_CHECK_MODULES], [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" != "no" ; then - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - $1_LIBS=`$PKG_CONFIG --libs "$2"` - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_WARN([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi - ]) - - dnl Check for pkg-config - AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config]) - AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes]) - dnl Check if QSA is installed AC_DEFUN([CHECK_QSA], --- 3,6 ---- *************** *** 207,230 **** ]) - dnl Check for OpenSSL - AC_DEFUN([CHECK_OPENSSL], - [ - if test "$PKGCONFIGFOUND" = "yes" ; then - have_openssl=no - - OPENSSL_REQ=0.9.7 - - PKG_CHECK_MODULES(OPENSSL, openssl >= $OPENSSL_REQ, have_openssl=yes, have_openssl=no) - - dnl Give error if we don't have OpenSSL - if test "x$have_openssl" = "xno"; then - echo "" - echo "*** At least version $OPENSSL_REQ of OpenSSL is required to build KFTPGrabber." - echo "" - exit 1 - fi - fi - ]) - dnl Stuff required for libssh AC_CHECK_LIB([resolv],[gethostbyname]) --- 162,165 ---- *************** *** 246,250 **** dnl Check for some stuff ! CHECK_OPENSSL CHECK_KDEVERSION CHECK_KIMPROXY --- 181,185 ---- dnl Check for some stuff ! KDE_CHECK_SSL CHECK_KDEVERSION CHECK_KIMPROXY |
|
From: Markus B. <mbr...@us...> - 2005-05-07 19:25:12
|
Update of /cvsroot/kftpgrabber/kftpgrabber/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9165 Added Files: pkg.m4.in Log Message: Add a file I missed in the last commit --- NEW FILE: pkg.m4.in --- dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page dnl also defines GSTUFF_PKG_ERRORS on error AC_DEFUN([PKG_CHECK_MODULES], [ succeeded=no if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi if test "$PKG_CONFIG" = "no" ; then echo "*** The pkg-config script could not be found. Make sure it is" echo "*** in your path, or set the PKG_CONFIG environment variable" echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then AC_MSG_CHECKING(for $2) if $PKG_CONFIG --exists "$2" ; then AC_MSG_RESULT(yes) succeeded=yes AC_MSG_CHECKING($1_CFLAGS) $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` AC_MSG_RESULT($$1_CFLAGS) AC_MSG_CHECKING($1_LIBS) $1_LIBS=`$PKG_CONFIG --libs "$2"` AC_MSG_RESULT($$1_LIBS) else $1_CFLAGS="" $1_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ifelse([$4], ,echo $$1_PKG_ERRORS,) fi AC_SUBST($1_CFLAGS) AC_SUBST($1_LIBS) else echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig" fi fi if test $succeeded = yes; then ifelse([$3], , :, [$3]) else ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) fi ]) |
|
From: Markus B. <mbr...@us...> - 2005-05-07 19:20:28
|
Update of /cvsroot/kftpgrabber/kftpgrabber/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7706 Modified Files: Doxyfile.am Doxyfile.global acinclude.m4.in am_edit cvs.sh deps.am libtool.m4.in ltmain.sh Log Message: Sync admin dir with KDE repo Index: libtool.m4.in =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/admin/libtool.m4.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libtool.m4.in 18 Aug 2004 09:45:15 -0000 1.2 --- libtool.m4.in 7 May 2005 19:20:18 -0000 1.3 *************** *** 2561,2576 **** case "$host_os" in rhapsody* | darwin1.[[012]]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' ;; *) # Darwin 1.3 on ! test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' ;; esac output_verbose_link_cmd='echo' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' ! _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes --- 2561,2587 ---- case "$host_os" in rhapsody* | darwin1.[[012]]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' ;; *) # Darwin 1.3 on ! if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' ! else ! case ${MACOSX_DEPLOYMENT_TARGET} in ! 10.[012]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' ! ;; ! 10.*) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' ! ;; ! esac ! fi ;; esac output_verbose_link_cmd='echo' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' ! _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes *************** *** 2689,2694 **** # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' --- 2700,2705 ---- # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' *************** *** 2716,2720 **** # overridden to take advantage of the native linker features on # the platform it is being used on. ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi --- 2727,2731 ---- # overridden to take advantage of the native linker features on # the platform it is being used on. ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' fi *************** *** 2810,2820 **** _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ! _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. --- 2821,2831 ---- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ! _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. *************** *** 2831,2835 **** _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds it's shared libraries. ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi --- 2842,2846 ---- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds it's shared libraries. ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi *************** *** 2853,2857 **** if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... --- 2864,2868 ---- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... *************** *** 2862,2866 **** cat $export_symbols >> $output_objdir/$soname.def; fi~ ! $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no --- 2873,2877 ---- cat $export_symbols >> $output_objdir/$soname.def; fi~ ! $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no *************** *** 2873,2880 **** case "$host_os" in rhapsody* | darwin1.[[012]]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' ;; *) # Darwin 1.3 on ! test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' ;; esac --- 2884,2902 ---- case "$host_os" in rhapsody* | darwin1.[[012]]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' ;; *) # Darwin 1.3 on ! if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' ! else ! case ${MACOSX_DEPLOYMENT_TARGET} in ! 10.[012]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' ! ;; ! 10.*) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' ! ;; ! esac ! fi ;; esac *************** *** 2885,2901 **** fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi ! _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi ! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes --- 2907,2923 ---- fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' fi ! _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi ! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes *************** *** 2954,2958 **** ;; aCC) ! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when --- 2976,2980 ---- ;; aCC) ! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when *************** *** 2967,2971 **** *) if test "$GXX" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support --- 2989,2993 ---- *) if test "$GXX" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support *************** *** 3024,3028 **** ;; *) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac --- 3046,3050 ---- ;; *) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ;; esac *************** *** 3045,3049 **** ;; *) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac --- 3067,3071 ---- ;; *) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ;; esac *************** *** 3060,3064 **** CC) # SGI C++ ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using --- 3082,3086 ---- CC) # SGI C++ ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using *************** *** 3071,3077 **** if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi fi --- 3093,3099 ---- if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi fi *************** *** 3090,3095 **** # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. ! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when --- 3112,3117 ---- # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. ! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when *************** *** 3113,3118 **** with_gnu_ld=yes _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' --- 3135,3140 ---- with_gnu_ld=yes _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' *************** *** 3121,3126 **** cxx) # Compaq C++ ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH --- 3143,3148 ---- cxx) # Compaq C++ ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH *************** *** 3179,3183 **** # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. ! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' --- 3201,3205 ---- # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. ! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' *************** *** 3196,3200 **** cxx) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' --- 3218,3222 ---- cxx) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' *************** *** 3214,3218 **** if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' --- 3236,3240 ---- if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' *************** *** 3239,3243 **** # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. ! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' --- 3261,3265 ---- # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. ! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' *************** *** 3255,3262 **** cxx) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ ! $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ $rm $lib.exp' --- 3277,3284 ---- cxx) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ ! $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ $rm $lib.exp' *************** *** 3277,3281 **** if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' --- 3299,3303 ---- if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' *************** *** 3334,3340 **** # Sun C++ 4.2, 5.x and Centerline C++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ! $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' --- 3356,3362 ---- # Sun C++ 4.2, 5.x and Centerline C++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ! $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' *************** *** 3370,3374 **** gcx) # Green Hills C++ Compiler ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. --- 3392,3396 ---- gcx) # Green Hills C++ Compiler ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. *************** *** 3380,3386 **** _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | grep -v '^2\.7' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ! $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' # Commands to make compiler produce verbose output that lists --- 3402,3408 ---- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | grep -v '^2\.7' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ! $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' # Commands to make compiler produce verbose output that lists *************** *** 3391,3397 **** # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ! $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' # Commands to make compiler produce verbose output that lists --- 3413,3419 ---- # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ! $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' # Commands to make compiler produce verbose output that lists *************** *** 5063,5067 **** # Joseph Beckenbach <jr...@be...> says some releases of gcc # support --undefined. This deserves some investigation. FIXME ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no --- 5085,5089 ---- # Joseph Beckenbach <jr...@be...> says some releases of gcc # support --undefined. This deserves some investigation. FIXME ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no *************** *** 5079,5083 **** if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... --- 5101,5105 ---- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... *************** *** 5088,5092 **** cat $export_symbols >> $output_objdir/$soname.def; fi~ ! $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs=no --- 5110,5114 ---- cat $export_symbols >> $output_objdir/$soname.def; fi~ ! $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs=no *************** *** 5099,5104 **** wlarc= else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; --- 5121,5126 ---- wlarc= else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; *************** *** 5118,5123 **** EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no --- 5140,5145 ---- EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no *************** *** 5134,5139 **** *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no --- 5156,5161 ---- *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no *************** *** 5249,5259 **** _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ! _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. --- 5271,5281 ---- _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ! _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. *************** *** 5270,5274 **** _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds it's shared libraries. ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi --- 5292,5296 ---- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds it's shared libraries. ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi *************** *** 5299,5303 **** shrext=".dll" # FIXME: Setting linknames here is a bad hack. ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' --- 5321,5325 ---- shrext=".dll" # FIXME: Setting linknames here is a bad hack. ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' *************** *** 5313,5320 **** case "$host_os" in rhapsody* | darwin1.[[012]]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' ;; *) # Darwin 1.3 on ! test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' ;; esac --- 5335,5353 ---- case "$host_os" in rhapsody* | darwin1.[[012]]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' ;; *) # Darwin 1.3 on ! if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' ! else ! case ${MACOSX_DEPLOYMENT_TARGET} in ! 10.[012]) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' ! ;; ! 10.*) ! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' ! ;; ! esac ! fi ;; esac *************** *** 5325,5340 **** fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi ! _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi ! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes --- 5358,5373 ---- fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' fi ! _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else ! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi ! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes *************** *** 5378,5382 **** # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd*) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes --- 5411,5415 ---- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd*) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes *************** *** 5386,5390 **** hpux9*) if test "$GCC" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' --- 5419,5423 ---- hpux9*) if test "$GCC" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' *************** *** 5404,5411 **** case "$host_cpu" in hppa*64*|ia64*) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac --- 5437,5444 ---- case "$host_cpu" in hppa*64*|ia64*) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ;; *) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' ;; esac *************** *** 5454,5458 **** irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' --- 5487,5491 ---- irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' *************** *** 5487,5491 **** _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' --- 5520,5524 ---- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' *************** *** 5497,5501 **** ;; *) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ;; --- 5530,5534 ---- ;; *) ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ;; *************** *** 5508,5512 **** _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ! _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; --- 5541,5545 ---- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ! _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; *************** *** 5515,5519 **** if test "$GCC" = yes; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' --- 5548,5552 ---- if test "$GCC" = yes; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' *************** *** 5527,5531 **** if test "$GCC" = yes; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else --- 5560,5564 ---- if test "$GCC" = yes; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else *************** *** 5552,5558 **** _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ! $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' --- 5585,5591 ---- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ! $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' *************** *** 5574,5578 **** # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' --- 5607,5611 ---- # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' *************** *** 5634,5640 **** _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi runpath_var='LD_RUN_PATH' --- 5667,5673 ---- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' else ! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' fi runpath_var='LD_RUN_PATH' Index: Doxyfile.am =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/admin/Doxyfile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Doxyfile.am 18 Aug 2004 09:45:15 -0000 1.2 --- Doxyfile.am 7 May 2005 19:20:18 -0000 1.3 *************** *** 84,89 **** done; \ fi; \ ! rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ ! $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ else\ if test -d $(top_builddir)/apidocs; then \ --- 84,93 ---- done; \ fi; \ ! symlink="$(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ ! if test ! -L "$symlink" -o `readlink "$symlink" 2>/dev/null... [truncated message content] |
|
From: Blacknator <bla...@us...> - 2005-05-06 14:33:39
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30100 Modified Files: kftpservermanagement.cpp Log Message: removed ioFTPd from management list Index: kftpservermanagement.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/kftpservermanagement.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** kftpservermanagement.cpp 27 Apr 2005 16:29:13 -0000 1.11 --- kftpservermanagement.cpp 6 May 2005 14:33:30 -0000 1.12 *************** *** 618,622 **** // category = addCategory(server, "implement in dialog"); ! // // command = addCommand(category, "site adduser <user> <password> [<ident@ip>]"); // addTextToElement(command, "Description", i18n("Adds a user")); --- 618,622 ---- // category = addCategory(server, "implement in dialog"); ! // // command = addCommand(category, "site adduser <user> <password> [<ident@ip>]"); // addTextToElement(command, "Description", i18n("Adds a user")); *************** *** 649,653 **** // "homedir. As of 1.16.x this dir is now \"kinda\" chroot'ed and they are""<br>" // "now unable to \"cd ..\".*/""<br>")); ! // // command = addCommand(category, "site addip <user> <ident@ip#1 ... ident@ip#10>"); // addTextToElement(command, "Description", i18n("Add IP to user")); --- 649,653 ---- // "homedir. As of 1.16.x this dir is now \"kinda\" chroot'ed and they are""<br>" // "now unable to \"cd ..\".*/""<br>")); ! // // command = addCommand(category, "site addip <user> <ident@ip#1 ... ident@ip#10>"); // addTextToElement(command, "Description", i18n("Add IP to user")); *************** *** 690,694 **** // "!1.2.3.4 #this user is not allowed to connect from this ip""<br>" // "2.3.4. #user's home ip mask (same as 2.3.4.*)""<br>")); ! // // command = addCommand(category, "site chgrp <user> <group> [<group>]"); // addTextToElement(command, "Description", i18n("Adds/removes a user from group(s)")); --- 690,694 ---- // "!1.2.3.4 #this user is not allowed to connect from this ip""<br>" // "2.3.4. #user's home ip mask (same as 2.3.4.*)""<br>")); ! // // command = addCommand(category, "site chgrp <user> <group> [<group>]"); // addTextToElement(command, "Description", i18n("Adds/removes a user from group(s)")); *************** *** 706,710 **** // "<b>NOTE:</b> When adding a user to a group the group must have available slots""<br>" // "left, even when you are a siteop.""<br>")); ! // // command = addCommand(category, "site chmod <mask> <pathname>"); // addTextToElement(command, "Description", i18n("Changes a file's permissions to mask")); --- 706,710 ---- // "<b>NOTE:</b> When adding a user to a group the group must have available slots""<br>" // "left, even when you are a siteop.""<br>")); ! // // command = addCommand(category, "site chmod <mask> <pathname>"); // addTextToElement(command, "Description", i18n("Changes a file's permissions to mask")); *************** *** 713,717 **** // "<i>Example:</i> site chmod 444 file.zip""<br>" // "<i>Example:</i> site chmod 777 /site/incoming""<br>")); ! // // command = addCommand(category, "site color [on/off/show]"); // addTextToElement(command, "Description", i18n("Enable/Disable the use of colors")); --- 713,717 ---- // "<i>Example:</i> site chmod 444 file.zip""<br>" // "<i>Example:</i> site chmod 777 /site/incoming""<br>")); ! // // command = addCommand(category, "site color [on/off/show]"); // addTextToElement(command, "Description", i18n("Enable/Disable the use of colors")); *************** *** 722,726 **** // "<br>" // "<b>NOTE:</b> This will screw up many windows clients if enabled""<br>")); ! // // command = addCommand(category, "site delip <user> <ident@ip> ..."); // addTextToElement(command, "Description", i18n("Delete IP from user, you can also use the ip number")); --- 722,726 ---- // "<br>" // "<b>NOTE:</b> This will screw up many windows clients if enabled""<br>")); ! // // command = addCommand(category, "site delip <user> <ident@ip> ..."); // addTextToElement(command, "Description", i18n("Delete IP from user, you can also use the ip number")); *************** *** 738,742 **** // "This would remove ident@ip #1 from the user 'Archimede'.""<br>" // "(Get list with site user <user>)""<br>")); ! // // command = addCommand(category, "site errlog [<number>] [<searchstring>]"); // addTextToElement(command, "Description", i18n("Display the error log")); --- 738,742 ---- // "This would remove ident@ip #1 from the user 'Archimede'.""<br>" // "(Get list with site user <user>)""<br>")); ! // // command = addCommand(category, "site errlog [<number>] [<searchstring>]"); // addTextToElement(command, "Description", i18n("Display the error log")); *************** *** 746,750 **** // "This displays '/glftpd/ftp-data/logs/error.log'""<br>" // "See info about \"site syslog\" for syntax.""<br>")); ! // // command = addCommand(category, "site gadduser <group> <user> <password> [<ident@ip#1 .. ident@ip#5>]"); // addTextToElement(command, "Description", i18n("Adds a user and changes his/her group to <group>")); --- 746,750 ---- // "This displays '/glftpd/ftp-data/logs/error.log'""<br>" // "See info about \"site syslog\" for syntax.""<br>")); ! // // command = addCommand(category, "site gadduser <group> <user> <password> [<ident@ip#1 .. ident@ip#5>]"); // addTextToElement(command, "Description", i18n("Adds a user and changes his/her group to <group>")); *************** *** 757,761 **** // "<b>NOTE:</b> When adding a user to a group the group must have available slots""<br>" // "left, even when you are a siteop.""<br>")); ! // // command = addCommand(category, "site give <user> <kbytes>[gGmM] [<message>]"); // addTextToElement(command, "Description", i18n("Gives credits to user (Taken from you")); --- 757,761 ---- // "<b>NOTE:</b> When adding a user to a group the group must have available slots""<br>" // "left, even when you are a siteop.""<br>")); ! // // command = addCommand(category, "site give <user> <kbytes>[gGmM] [<message>]"); // addTextToElement(command, "Description", i18n("Gives credits to user (Taken from you")); *************** *** 767,771 **** // "This will give around 100mb of credits to user 'Archimede' and send""<br>" // "the message 'there you go'.""<br>")); ! // // command = addCommand(category, "site grpren <groupname> <NEWgroupname>"); // addTextToElement(command, "Description", i18n("Rename a group")); --- 767,771 ---- // "This will give around 100mb of credits to user 'Archimede' and send""<br>" // "the message 'there you go'.""<br>")); ! // // command = addCommand(category, "site grpren <groupname> <NEWgroupname>"); // addTextToElement(command, "Description", i18n("Rename a group")); *************** *** 777,781 **** // "This would change the group name 'ftp' to 'new_ftp'.""<br>" // "All users in group 'ftp' will now automatically belong to 'new_ftp'.""<br>")); ! // // command = addCommand(category, "site kill <pid>"); // addTextToElement(command, "Description", i18n("Kill a PID")); --- 777,781 ---- // "This would change the group name 'ftp' to 'new_ftp'.""<br>" // "All users in group 'ftp' will now automatically belong to 'new_ftp'.""<br>")); ! // // command = addCommand(category, "site kill <pid>"); // addTextToElement(command, "Description", i18n("Kill a PID")); *************** *** 786,790 **** // "<br>" // "This will kill pid# 345 (if it belongs to a glftpd user).""<br>")); ! // // command = addCommand(category, "site nuke <directory> <multiplier> <message>"); // addTextToElement(command, "Description", i18n("Nuke a director")); --- 786,790 ---- // "<br>" // "This will kill pid# 345 (if it belongs to a glftpd user).""<br>")); ! // // command = addCommand(category, "site nuke <directory> <multiplier> <message>"); // addTextToElement(command, "Description", i18n("Nuke a director")); *************** *** 799,803 **** // "<b>NOTE:</b> You can enclose the directory in braces if you have spaces in the name""<br>" // "<i>Example:</i> site NUKE {My directory name} 1 because_i_dont_like_it""<br>")); ! // // command = addCommand(category, "site new [.] [<#>]"); // addTextToElement(command, "Description", i18n("Display newest created directories (taken from dirlog)")); --- 799,803 ---- // "<b>NOTE:</b> You can enclose the directory in braces if you have spaces in the name""<br>" // "<i>Example:</i> site NUKE {My directory name} 1 because_i_dont_like_it""<br>")); ! // // command = addCommand(category, "site new [.] [<#>]"); // addTextToElement(command, "Description", i18n("Display newest created directories (taken from dirlog)")); *************** *** 823,827 **** // "with /site/private as a parameter, and use msgpath or a custom""<br>" // "command to display it.""<br>")); ! // // command = addCommand(category, "site onel [<string>]"); // addTextToElement(command, "Description", i18n("Show/Add oneliner")); --- 823,827 ---- // "with /site/private as a parameter, and use msgpath or a custom""<br>" // "command to display it.""<br>")); ! // // command = addCommand(category, "site onel [<string>]"); // addTextToElement(command, "Description", i18n("Show/Add oneliner")); *************** *** 836,840 **** // "<br>" // "This will add 'Archimede was here' to the oneliners.""<br>")); ! // // command = addCommand(category, "site renuser <old_username> <new_username>"); // addTextToElement(command, "Description", i18n("Rename a use")); --- 836,840 ---- // "<br>" // "This will add 'Archimede was here' to the oneliners.""<br>")); ! // // command = addCommand(category, "site renuser <old_username> <new_username>"); // addTextToElement(command, "Description", i18n("Rename a use")); *************** *** 844,848 **** // "<i>Example:</i> site renuser usurper Usurper""<br>" // "This will make usurper look bigger and meaner""<br>")); ! // // command = addCommand(category, "site request [<string>]"); // addTextToElement(command, "Description", i18n("Add/Display Requests")); --- 844,848 ---- // "<i>Example:</i> site renuser usurper Usurper""<br>" // "This will make usurper look bigger and meaner""<br>")); ! // // command = addCommand(category, "site request [<string>]"); // addTextToElement(command, "Description", i18n("Add/Display Requests")); *************** *** 859,863 **** // "<br>" // "If logging is enabled, new requests are logged to glftpd.log""<br>")); ! // // command = addCommand(category, "site reqfilled <#>"); // addTextToElement(command, "Description", i18n("Fill a request")); --- 859,863 ---- // "<br>" // "If logging is enabled, new requests are logged to glftpd.log""<br>")); ! // // command = addCommand(category, "site reqfilled <#>"); // addTextToElement(command, "Description", i18n("Fill a request")); *************** *** 873,877 **** // "If logging is enabled, filled requests get logged to glftpd.log.""<br>" // "They are also always logged to request.log.""<br>")); ! // // command = addCommand(category, "site reqlog [<number>] [<searchstring>]"); // addTextToElement(command, "Description", i18n("Show the log of filled requests")); --- 873,877 ---- // "If logging is enabled, filled requests get logged to glftpd.log.""<br>" // "They are also always logged to request.log.""<br>")); ! // // command = addCommand(category, "site reqlog [<number>] [<searchstring>]"); // addTextToElement(command, "Description", i18n("Show the log of filled requests")); *************** *** 881,885 **** // "This displays '/glftpd/ftp-data/logs/request.log'""<br>" // "See info about \"site syslog\" for syntax.""<br>")); ! // // command = addCommand(category, "site search <string> [<string2> ...]"); // addTextToElement(command, "Description", i18n("Searches the entire site for matching directory names")); --- 881,885 ---- // "This displays '/glftpd/ftp-data/logs/request.log'""<br>" // "See info about \"site syslog\" for syntax.""<br>")); ! // // command = addCommand(category, "site search <string> [<string2> ...]"); // addTextToElement(command, "Description", i18n("Searches the entire site for matching directory names")); *************** *** 897,901 **** // "<i>Example:</i> site search linux gnu""<br>" // "This will find all directories that contain both \"linux\" and \"gnu\"""<br>")); ! // // command = addCommand(category, "site tagline [<tagline>]"); // addTextToElement(command, "Description", i18n("Shows/Sets your taglin")); --- 897,901 ---- // "<i>Example:</i> site search linux gnu""<br>" // "This will find all directories that contain both \"linux\" and \"gnu\"""<br>")); ! // // command = addCommand(category, "site tagline [<tagline>]"); // addTextToElement(command, "Description", i18n("Shows/Sets your taglin")); *************** *** 910,914 **** // "<br>" // "This will set your tagline to 'Archimede owns'.""<br>")); ! // // command = addCommand(category, "site take <user> <kbytes>[gGmM] [<message>]"); // addTextToElement(command, "Description", i18n("Removes credit from use")); --- 910,914 ---- // "<br>" // "This will set your tagline to 'Archimede owns'.""<br>")); ! // // command = addCommand(category, "site take <user> <kbytes>[gGmM] [<message>]"); // addTextToElement(command, "Description", i18n("Removes credit from use")); *************** *** 920,924 **** // "This will remove 100mb of credits from the user 'Archimede' and""<br>" // "send the message haha to him.""<br>")); ! // // command = addCommand(category, "site users [keyword|flag|=group|usernam*]"); // addTextToElement(command, "Description", i18n("Lists users and shows their group, ul stats, dl stats, and credits")); --- 920,924 ---- // "This will remove 100mb of credits from the user 'Archimede' and""<br>" // "send the message haha to him.""<br>")); ! // // command = addCommand(category, "site users [keyword|flag|=group|usernam*]"); // addTextToElement(command, "Description", i18n("Lists users and shows their group, ul stats, dl stats, and credits")); *************** *** 939,943 **** // "whose name starts with those letters. <i>Example:</i> site users f*""<br>" // "This will find frank, frog, etc.""<br>")); ! // // command = addCommand(category, "site update <string>"); // addTextToElement(command, "Description", i18n("Adds all dirs matching <string> in current directory to irlog (for \"site new\")")); --- 939,943 ---- // "whose name starts with those letters. <i>Example:</i> site users f*""<br>" // "This will find frank, frog, etc.""<br>")); ! // // command = addCommand(category, "site update <string>"); // addTextToElement(command, "Description", i18n("Adds all dirs matching <string> in current directory to irlog (for \"site new\")")); *************** *** 948,952 **** // "<br>" // "This will add all directories in current path that start with A to the dirlog.""<br>")); ! // // command = addCommand(category, "site syslog [<number>] [<searchstring>]"); // addTextToElement(command, "Description", i18n("Display the user changes log (ftp-data/logs/sysop.log)")); --- 948,952 ---- // "<br>" // "This will add all directories in current path that start with A to the dirlog.""<br>")); ! // // command = addCommand(category, "site syslog [<number>] [<searchstring>]"); // addTextToElement(command, "Description", i18n("Display the user changes log (ftp-data/logs/sysop.log)")); *************** *** 961,965 **** // "<i>Example:</i> site syslog 10 deleted""<br>" // "<i>Example:</i> site syslog added -OR- site syslog 0 added""<br>")); ! // // command = addCommand(category, "site unnuke <directory> <message>"); // addTextToElement(command, "Description", i18n("Unnuke a directory")); --- 961,965 ---- // "<i>Example:</i> site syslog 10 deleted""<br>" // "<i>Example:</i> site syslog added -OR- site syslog 0 added""<br>")); ! // // command = addCommand(category, "site unnuke <directory> <message>"); // addTextToElement(command, "Description", i18n("Unnuke a directory")); *************** *** 976,980 **** // "You need to configure glftpd to keep nuked files if you want to unnuke.""<br>" // "See the section about glftpd.conf.""<br>")); ! // // command = addCommand(category, "site undupe <string>"); // addTextToElement(command, "Description", i18n("Remove filename(s) from ftp-data/logs/dupefil")); --- 976,980 ---- // "You need to configure glftpd to keep nuked files if you want to unnuke.""<br>" // "See the section about glftpd.conf.""<br>")); ! // // command = addCommand(category, "site undupe <string>"); // addTextToElement(command, "Description", i18n("Remove filename(s) from ftp-data/logs/dupefil")); *************** *** 986,990 **** // "This will remove all files that start with the string 'cls' from""<br>" // "the dupe database.""<br>")); ! // // command = addCommand(category, "site predupe <filename>"); // addTextToElement(command, "Description", i18n("Adds <filename> to the dupefile database, so that it can't e uploaded.")); --- 986,990 ---- // "This will remove all files that start with the string 'cls' from""<br>" // "the dupe database.""<br>")); ! // // command = addCommand(category, "site predupe <filename>"); // addTextToElement(command, "Description", i18n("Adds <filename> to the dupefile database, so that it can't e uploaded.")); *************** *** 996,1000 **** // "Files that match those listed under ignore_type in glftpd.conf will""<br>" // "not be added.""<br>")); ! // // command = addCommand(category, "site wipe [-r] <file/directory>"); // addTextToElement(command, "Description", ""); --- 996,1000 ---- // "Files that match those listed under ignore_type in glftpd.conf will""<br>" // "not be added.""<br>")); ! // // command = addCommand(category, "site wipe [-r] <file/directory>"); // addTextToElement(command, "Description", ""); *************** *** 1031,1035 **** // "<b>NOTE:</b> The two commands below require unzip to reside in the /bin directory""<br>" // "(it's /bin in the chroot'ed environment, so /glftpd/bin in reality)""<br>")); ! // // command = addCommand(category, "site xdupe [mode]"); // addTextToElement(command, "Description", ""); --- 1031,1035 ---- // "<b>NOTE:</b> The two commands below require unzip to reside in the /bin directory""<br>" // "(it's /bin in the chroot'ed environment, so /glftpd/bin in reality)""<br>")); ! // // command = addCommand(category, "site xdupe [mode]"); // addTextToElement(command, "Description", ""); *************** *** 1066,1076 **** ! server = m_document.createElement("server"); ! server.setAttribute("name", "ioFTPd"); ! root.appendChild(server); ! ! command = m_document.createElement("command"); ! command.setAttribute("name", "site stat"); ! server.appendChild(command); } --- 1066,1076 ---- ! // server = m_document.createElement("server"); ! // server.setAttribute("name", "ioFTPd"); ! // root.appendChild(server); ! // ! // command = m_document.createElement("command"); ! // command.setAttribute("name", "site stat"); ! // server.appendChild(command); } |
|
From: Jernej K. <ko...@us...> - 2005-05-06 13:11:35
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src/widgets/filedirview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6956 Modified Files: kftpfiledirlistview.cpp Log Message: Fix local file items refreshing (BUG 1196521). Index: kftpfiledirlistview.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/widgets/filedirview/kftpfiledirlistview.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** kftpfiledirlistview.cpp 28 Apr 2005 08:52:28 -0000 1.32 --- kftpfiledirlistview.cpp 6 May 2005 13:11:25 -0000 1.33 *************** *** 953,957 **** while (i) { // Search by filePtr (unique identification for this KFileItem) ! if (((KFTPFileDirListViewItem*)i)->m_filePtr == item) { if (item->isDir()) { // Clear current url from treeview --- 953,957 ---- while (i) { // Search by filePtr (unique identification for this KFileItem) ! if (static_cast<KFTPFileDirListViewItem*>(i)->m_filePtr == item) { if (item->isDir()) { // Clear current url from treeview *************** *** 986,989 **** --- 986,993 ---- slotDirListerDeleteItem(item); new KFTPFileDirListViewItem(this, item); + + // If we have a tree view and this is a directory + if (item->isDir() && m_tree) + m_tree->createFolder(item->url(), item->pixmap(16)); } } |
|
From: Jernej K. <ko...@us...> - 2005-05-06 11:45:09
|
Update of /cvsroot/kftpgrabber/kftpgrabber In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18219 Modified Files: configure.in.in Log Message: Added configure check for OpenSSL. Index: configure.in.in =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/configure.in.in,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** configure.in.in 29 Apr 2005 12:40:19 -0000 1.25 --- configure.in.in 6 May 2005 11:45:00 -0000 1.26 *************** *** 3,6 **** --- 3,51 ---- AM_INIT_AUTOMAKE(kftpgrabber, 0.6.0-beta2) + AC_DEFUN([PKG_CHECK_MODULES], [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" != "no" ; then + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + $1_LIBS=`$PKG_CONFIG --libs "$2"` + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_WARN([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi + ]) + + dnl Check for pkg-config + AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config]) + AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes]) + dnl Check if QSA is installed AC_DEFUN([CHECK_QSA], *************** *** 162,165 **** --- 207,230 ---- ]) + dnl Check for OpenSSL + AC_DEFUN([CHECK_OPENSSL], + [ + if test "$PKGCONFIGFOUND" = "yes" ; then + have_openssl=no + + OPENSSL_REQ=0.9.7 + + PKG_CHECK_MODULES(OPENSSL, openssl >= $OPENSSL_REQ, have_openssl=yes, have_openssl=no) + + dnl Give error if we don't have OpenSSL + if test "x$have_openssl" = "xno"; then + echo "" + echo "*** At least version $OPENSSL_REQ of OpenSSL is required to build KFTPGrabber." + echo "" + exit 1 + fi + fi + ]) + dnl Stuff required for libssh AC_CHECK_LIB([resolv],[gethostbyname]) *************** *** 181,184 **** --- 246,250 ---- dnl Check for some stuff + CHECK_OPENSSL CHECK_KDEVERSION CHECK_KIMPROXY |
|
From: Jernej K. <ko...@us...> - 2005-04-30 11:16:57
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src/ftp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19215 Modified Files: ftpsocket.cpp Log Message: Fixed timeshift. Index: ftpsocket.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/ftp/ftpsocket.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** ftpsocket.cpp 19 Apr 2005 15:22:21 -0000 1.38 --- ftpsocket.cpp 30 Apr 2005 11:16:48 -0000 1.39 *************** *** 1534,1549 **** // 213 20031222105809 // 213 YYYYMMDDhhmmss ! time_t curtime = time(0L); ! struct tm *p_dt = gmtime(&curtime); QString tmp(m_responseBuf); tmp.remove(0, 4); ! p_dt->tm_year = tmp.left(4).toInt() - 1900; ! p_dt->tm_mon = tmp.mid(4, 2).toInt(); ! p_dt->tm_mday = tmp.mid(6, 2).toInt(); ! p_dt->tm_hour = tmp.mid(8, 2).toInt(); ! p_dt->tm_min = tmp.mid(10, 2).toInt(); ! p_dt->tm_sec = tmp.mid(12, 2).toInt(); ! p_modtime = mktime(p_dt); } } --- 1534,1548 ---- // 213 20031222105809 // 213 YYYYMMDDhhmmss ! struct tm p_dt; QString tmp(m_responseBuf); tmp.remove(0, 4); ! p_dt.tm_year = tmp.left(4).toInt() - 1900; ! p_dt.tm_mon = tmp.mid(4, 2).toInt() - 1; ! p_dt.tm_mday = tmp.mid(6, 2).toInt(); ! p_dt.tm_hour = tmp.mid(8, 2).toInt(); ! p_dt.tm_min = tmp.mid(10, 2).toInt(); ! p_dt.tm_sec = tmp.mid(12, 2).toInt(); ! p_modtime = mktime(&p_dt); } } |
|
From: Jernej K. <ko...@us...> - 2005-04-29 12:40:49
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16865 Modified Files: main.cpp Log Message: Prepare for 0.6.0-beta2. Index: main.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/main.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** main.cpp 27 Apr 2005 11:41:14 -0000 1.29 --- main.cpp 29 Apr 2005 12:40:36 -0000 1.30 *************** *** 52,56 **** I18N_NOOP("KFTPGrabber - a FTP client for KDE"); ! static const char version[] = "0.6.0-beta1"; static KCmdLineOptions options[] = --- 52,56 ---- I18N_NOOP("KFTPGrabber - a FTP client for KDE"); ! static const char version[] = "0.6.0-beta2"; static KCmdLineOptions options[] = |
|
From: Jernej K. <ko...@us...> - 2005-04-29 12:40:38
|
Update of /cvsroot/kftpgrabber/kftpgrabber In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16642 Modified Files: configure.in.in Log Message: Prepare for 0.6.0-beta2. Index: configure.in.in =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/configure.in.in,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** configure.in.in 27 Apr 2005 11:44:42 -0000 1.24 --- configure.in.in 29 Apr 2005 12:40:19 -0000 1.25 *************** *** 1,5 **** #MIN_CONFIG(3.0.0) ! AM_INIT_AUTOMAKE(kftpgrabber, 0.6.0-beta1) dnl Check if QSA is installed --- 1,5 ---- #MIN_CONFIG(3.0.0) ! AM_INIT_AUTOMAKE(kftpgrabber, 0.6.0-beta2) dnl Check if QSA is installed |
|
From: Jernej K. <ko...@us...> - 2005-04-28 17:39:07
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1931 Modified Files: kftpqueueconverter.cpp Log Message: Dirty hack to properly convert Chinese URLs. Index: kftpqueueconverter.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/kftpqueueconverter.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kftpqueueconverter.cpp 8 Apr 2005 05:43:16 -0000 1.7 --- kftpqueueconverter.cpp 28 Apr 2005 17:38:58 -0000 1.8 *************** *** 108,115 **** QDomElement item = m_xml.createElement("item"); parent.appendChild(item); // Create text nodes ! createTextNode("source", QString::fromLocal8Bit(transfer->getSourceUrl().url().local8Bit()), item); ! createTextNode("dest", transfer->getDestUrl().url(), item); createTextNode("size", QString::number(transfer->getSize()), item); createTextNode("type", transfer->isDir() ? "directory" : "file", item); --- 108,132 ---- QDomElement item = m_xml.createElement("item"); parent.appendChild(item); + + // XXX Dirty hack to properly convert chinese filenames + QString sourceUrl; + sourceUrl = transfer->getSourceUrl().htmlURL(); + if (transfer->getSourceUrl().pass() != QString::null) { + sourceUrl = sourceUrl.insert(sourceUrl.find('@'), ":" + transfer->getSourceUrl().pass()); + } + + createTextNode("source", sourceUrl, item); + + QString destUrl; + destUrl = transfer->getDestUrl().htmlURL(); + if (transfer->getDestUrl().pass() != QString::null) { + destUrl = destUrl.insert(destUrl.find('@'), ":" + transfer->getDestUrl().pass()); + } + + createTextNode("dest", destUrl, item); // Create text nodes ! //createTextNode("source", QString::fromLocal8Bit(transfer->getSourceUrl().url().local8Bit()), item); ! //createTextNode("dest", transfer->getDestUrl().url(), item); createTextNode("size", QString::number(transfer->getSize()), item); createTextNode("type", transfer->isDir() ? "directory" : "file", item); |
|
From: Jernej K. <ko...@us...> - 2005-04-28 10:51:13
|
Update of /cvsroot/kftpgrabber/kftpgrabber/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12348 Added Files: changelog compat control copyright dirs docs files kftpgrabber.doc-base.EX kftpgrabber.substvars README.Debian rules Log Message: Added debianization by Christoph Thielecke. --- NEW FILE: kftpgrabber.doc-base.EX --- Document: kftpgrabber Title: Debian kftpgrabber Manual Author: <insert document author here> Abstract: This manual describes what kftpgrabber is and how it can be used to manage online manuals on Debian systems. Section: unknown Format: debiandoc-sgml Files: /usr/share/doc/kftpgrabber/kftpgrabber.sgml.gz Format: postscript Files: /usr/share/doc/kftpgrabber/kftpgrabber.ps.gz Format: text Files: /usr/share/doc/kftpgrabber/kftpgrabber.text.gz Format: HTML Index: /usr/share/doc/kftpgrabber/html/index.html Files: /usr/share/doc/kftpgrabber/html/*.html --- NEW FILE: files --- kftpgrabber_0.6.0-beta1-1_i386.deb Networking optional --- NEW FILE: copyright --- This package was debianized by Christoph Thielecke <cri...@gm...> on Thu, 28 Apr 2005 11:37:53 +0200. It was downloaded from <fill in ftp site> Copyright Holder: <put author(s) name and email here> License: <Put the license of the package here> --- NEW FILE: changelog --- kftpgrabber (0.6.0-beta1-1) unstable; urgency=low * Initial Release. -- Christoph Thielecke <cri...@gm...> Thu, 28 Apr 2005 11:37:53 +0200 --- NEW FILE: rules --- #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif config.status: configure dh_testdir # Add here commands to configure the package. CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info build: build-stamp build-stamp: config.status dh_testdir # Add here commands to compile the package. $(MAKE) #docbook-to-man debian/kftpgrabber.sgml > kftpgrabber.1 touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif dh_clean install: build dh_testdir dh_testroot # dh_clean -k dh_installdirs # Add here commands to install the package into debian/kftpgrabber. $(MAKE) install DESTDIR=$(CURDIR)/debian/kftpgrabber # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs dh_installexamples # dh_install # dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime # dh_installinit # dh_installcron # dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms # dh_perl # dh_python # dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install --- NEW FILE: docs --- NEWS README TODO --- NEW FILE: kftpgrabber.substvars --- shlibs:Depends=kdelibs4 (>= 4:3.4.0), libart-2.0-2 (>= 2.3.16), libaudio2, libc6 (>= 2.3.2.ds1-21), libfam0c102, libfontconfig1 (>= 2.3.0), libfreetype6 (>= 2.1.5-1), libgcc1 (>= 1:3.4.1-3), libice6 | xlibs (>> 4.1.0), libidn11 (>= 0.5.13), libpng12-0 (>= 1.2.8rel), libqt3c102-mt (>= 3:3.3.4), libsm6 | xlibs (>> 4.1.0), libssl0.9.7, libstdc++5 (>= 1:3.3.4-1), libx11-6 | xlibs (>> 4.1.0), libxcursor1 (>> 1.1.2), libxext6 | xlibs (>> 4.1.0), libxft2 (>> 2.1.1), libxrandr2 | xlibs (>> 4.3.0), libxrender1, libxt6 | xlibs (>> 4.1.0), zlib1g (>= 1:1.2.1) --- NEW FILE: compat --- 4 --- NEW FILE: control --- Source: kftpgrabber Section: Networking Priority: optional Maintainer: Christoph Thielecke <cri...@gm...> Build-Depends: debhelper (>= 4.0.0), autotools-dev Standards-Version: 3.6.1 Package: kftpgrabber Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: FTP client for KDE KFTPGrabber is a graphical FTP client for KDE. It was started in the year 2003, because there was no good graphical clients for KDE and because many Linux users still use Windows FTP clients (via Wine), since most Linux counterparts lack some important features. So, this project tries to make a complete FTP client solution with support for plugins, scripting and everything else the users needs. --- NEW FILE: README.Debian --- kftpgrabber for Debian ---------------------- <possible notes regarding this package - if none, delete this file> -- Christoph Thielecke <cri...@gm...>, Thu, 28 Apr 2005 11:37:53 +0200 --- NEW FILE: dirs --- usr/bin usr/sbin |
|
From: Jernej K. <ko...@us...> - 2005-04-28 10:49:31
|
Update of /cvsroot/kftpgrabber/kftpgrabber/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11313/debian Log Message: Directory /cvsroot/kftpgrabber/kftpgrabber/debian added to the repository |
|
From: Jernej K. <ko...@us...> - 2005-04-28 10:31:09
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1428 Modified Files: kftpbookmarks.cpp kftpbookmarks.h Log Message: Added bookmark validation to prevent missing ids. Index: kftpbookmarks.h =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/kftpbookmarks.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kftpbookmarks.h 4 Mar 2005 12:25:17 -0000 1.8 --- kftpbookmarks.h 28 Apr 2005 10:31:01 -0000 1.9 *************** *** 132,135 **** --- 132,138 ---- QDomNode findCategoryElementById(const QString &id, QDomNode parent = QDomNode()); + // Validation + void validate(QDomNode node = QDomNode()); + // XML conversion methods void versionUpdate(); Index: kftpbookmarks.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/kftpbookmarks.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** kftpbookmarks.cpp 20 Apr 2005 15:45:48 -0000 1.33 --- kftpbookmarks.cpp 28 Apr 2005 10:31:01 -0000 1.34 *************** *** 342,345 **** --- 342,348 ---- versionUpdate(); + // Document validation + Manager::validate(); + // We have just loaded the bookmarks, so update all the menus emit update(); *************** *** 383,386 **** --- 386,411 ---- } + void Manager::validate(QDomNode node) + { + if (node.isNull()) + node = m_document.documentElement(); + + QDomNode n = node.firstChild(); + + while (!n.isNull()) { + if (n.toElement().tagName() == "category") { + if (!n.toElement().hasAttribute("id")) + n.toElement().setAttribute("id", QString("cat-%1").arg(KApplication::randomString(7))); + + Manager::validate(n); + } else if (n.toElement().tagName() == "server") { + if (!n.toElement().hasAttribute("id")) + n.toElement().setAttribute("id", QString("site-%1").arg(KApplication::randomString(7))); + } + + n = n.nextSibling(); + } + } + void Manager::versionUpdate() { |
|
From: Jernej K. <ko...@us...> - 2005-04-28 08:52:38
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src/widgets/filedirview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12862 Modified Files: kftpfiledirlistview.cpp Log Message: Set home URL upon connecting if it is not set. Index: kftpfiledirlistview.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/widgets/filedirview/kftpfiledirlistview.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** kftpfiledirlistview.cpp 27 Apr 2005 11:14:20 -0000 1.31 --- kftpfiledirlistview.cpp 28 Apr 2005 08:52:28 -0000 1.32 *************** *** 908,911 **** --- 908,912 ---- KURL newURL = m_ftpClient->getClient()->getClientInfoUrl(); newURL.setPath(m_homeURL.path()); + m_homeURL = newURL; m_curURL = newURL; |
|
From: Jernej K. <ko...@us...> - 2005-04-28 08:35:46
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2698 Modified Files: kftpquickconnectdialog.cpp Log Message: Fix anonymous password setup. Index: kftpquickconnectdialog.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/widgets/kftpquickconnectdialog.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** kftpquickconnectdialog.cpp 31 Mar 2005 18:51:32 -0000 1.19 --- kftpquickconnectdialog.cpp 28 Apr 2005 08:35:34 -0000 1.20 *************** *** 217,223 **** // Use the appropriate e-mail address for anonymous accounts if (!FTPConfig().m_anonMail.isEmpty()) ! m_layout->passwordBox->setText(FTPConfig().m_anonMail); else ! m_layout->passwordBox->setText("use...@an..."); } else { m_layout->usernameBox->setText(tmpUser); --- 217,223 ---- // Use the appropriate e-mail address for anonymous accounts if (!FTPConfig().m_anonMail.isEmpty()) ! m_layout->passwordBox->insert(FTPConfig().m_anonMail); else ! m_layout->passwordBox->insert("use...@an..."); } else { m_layout->usernameBox->setText(tmpUser); |
|
From: Jernej K. <ko...@us...> - 2005-04-27 16:31:36
|
Update of /cvsroot/kftpgrabber/kftpgrabber In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5701 Modified Files: ChangeLog Log Message: Updated changelog. Index: ChangeLog =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ChangeLog 20 Nov 2004 14:57:10 -0000 1.10 --- ChangeLog 27 Apr 2005 16:31:26 -0000 1.11 *************** *** 1,8 **** KFTPGrabber Changelog ===================== ! (c) 2003-2004 the KFTPGrabber developers. ! VERSION 0.6.0 ADD: According to the KDE HIG minimize to tray if the mainwindow is closed VERSION 0.5.0 --- 1,17 ---- KFTPGrabber Changelog ===================== ! (c) 2003-2005 the KFTPGrabber developers. ! VERSION 0.6.0-beta1 ADD: According to the KDE HIG minimize to tray if the mainwindow is closed + ADD: Experimental support for multiple threads + ADD: Traffic graph + ADD: Commonly used site commands for GlFTPD (more to follow) + ADD: Support for setting per-site encoding + CHG: Updated libssh to the latest version to support keyboard-interactive auth + CHG: Removed howl in favor of KDNSSD Zeroconf API + FIX: Lots of crash fixes + FIX: Rewritten directory listing parser + FIX: Different queue improvements and bugfixes VERSION 0.5.0 |
|
From: Jernej K. <ko...@us...> - 2005-04-27 16:30:37
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5275 Modified Files: kftpservermanagementlistview.cpp Log Message: Some server management quick fixes before the 0.6-beta1 release. Index: kftpservermanagementlistview.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/widgets/kftpservermanagementlistview.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kftpservermanagementlistview.cpp 26 Apr 2005 15:42:03 -0000 1.4 --- kftpservermanagementlistview.cpp 27 Apr 2005 16:30:28 -0000 1.5 *************** *** 117,121 **** // Add columns ! addColumn(i18n("Command")); addColumn(i18n("Description")); --- 117,121 ---- // Add columns ! addColumn(i18n("Command"), 200); addColumn(i18n("Description")); *************** *** 139,142 **** --- 139,147 ---- // get current selected item; m_item = dynamic_cast<KFTPServerManagementListViewItem*>(item); + + // Ignore categories + if (item->childCount() > 0) + return; + // save clicked item position m_itemPos = pos; |
|
From: Jernej K. <ko...@us...> - 2005-04-27 16:29:40
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4611 Modified Files: kftpservermanagement.cpp Log Message: Some server management quick fixes before the 0.6-beta1 release. Index: kftpservermanagement.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/kftpservermanagement.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** kftpservermanagement.cpp 27 Apr 2005 14:59:41 -0000 1.10 --- kftpservermanagement.cpp 27 Apr 2005 16:29:13 -0000 1.11 *************** *** 617,1055 **** "Shows detailed information about users online""<br>")); ! category = addCategory(server, "implement in dialog"); ! ! command = addCommand(category, "site adduser <user> <password> [<ident@ip>]"); ! addTextToElement(command, "Description", i18n("Adds a user")); ! addTextToElement(command, "Whats This", i18n( ! "Adds a user. You can have wild cards for users that have dynamic ips<br>" ! "<i>Examples:</i> *@192.168.1.* , frank@192.168.*.* , bob@192.*.*.*<br>" ! "(*@192.168.1.1[5-9] will allow only 192.168.1.15-19 to connect but no one else)<br>" ! "<br>" ! "If a user is added by a groupadmin, that user will have the GLOCK<br>" ! "flag enabled and will inherit the home directory from the default.user<br>" ! "or default.<groupname> file.<br>" ! "<br>" ! "All default values for the user are read from file default.user in<br>" ! "/glftpd/ftp-data/users. Comments inside describe what is what.<br>" ! "Gadmins can be assigned their own default.<group> userfiles<br>" ! "as templates to be used when they add a user, if one is not found,<br>" ! "default.user will be used.<br>" ! "default.groupname files will also be used for \"site gadduser\"." ! "<br>" ! "<i>Example:</i> site ADDUSER Archimede mypassword""<br>" ! "This would add the user 'Archimede' with the password 'mypassword'.""<br>" ! "<br>" ! "<i>Example:</i> site ADDUSER Archimede mypassword *@127.0.0.1""<br>" ! "<br>" ! "This would do the same as above + add the ip '*@127.0.0.1' at the""<br>" ! "same time.""<br>" ! "<br>" ! "HOMEDIRS:""<br>" ! "After login, the user will automatically be transferred into his/her""<br>" ! "homedir. As of 1.16.x this dir is now \"kinda\" chroot'ed and they are""<br>" ! "now unable to \"cd ..\".*/""<br>")); ! ! command = addCommand(category, "site addip <user> <ident@ip#1 ... ident@ip#10>"); ! addTextToElement(command, "Description", i18n("Add IP to user")); ! addTextToElement(command, "Whats This", i18n( ! "Add IP to user""<br>" ! "<br>" ! "Note: if you don't know what ident is, you need to read your""<br>" ! "internet-for-dummies book first.""<br>" ! "<br>" ! "<i>Example:</i> site addip Archimede Archimede@127.0.0.1 *@10.10.""<br>" ! "This would add the ident@ip 'Archimede@127.0.0.1' and mask '*@10.10.*'""<br>" ! "to user 'Archimede'. (* at the end is optional in this case)""<br>" ! "<br>" ! "<i>Example:</i> site addip Archimede Arc...@bl... Archimede@209.44.* *@24.1.64.20""<br>" ! "This would add all 3 ip masks to user 'Archimede'.""<br>" ! "<br>" ! "<i>Example:</i> site addip lamer someident@3.1.2.1[2-5]?""<br>" ! "This mask will match IPs 3.1.2.120 through 3.1.2.159""<br>" ! "Warning: You can't use [] to declare range of numbers > 9, so [10-79]""<br>" ! "will not work. Use [1-7]? or [1-7][0-9] instead. Ranges that don't start""<br>" ! "at a power of 10 or don't end at 9 are not possible unless you add""<br>" ! "more than 1 mask.""<br>" ! "<br>" ! "<b>NOTE:</b> There is a maximum of 10 IPs that can go into the userfile.""<br>" ! "If you need more than 10, you need to add them to a text file, each one""<br>" ! "on a line by itself, in the format ident@ip. To make glftpd use this""<br>" ! "file, the first IP in the userfile (IP0 in site user) has to look like""<br>" ! "this:""<br>" ! "IP !/path/to/iplist.txt""<br>" ! "Glftpd won't let you add an IP like that; you need to edit the userfile""<br>" ! "manually (in /glftpd/ftp-data/users) and add it.""<br>" ! "Make sure there are no DOS carriage returns at the end of each line in""<br>" ! "the file containing the list of IPs.""<br>" ! "If an entry in that file starts with !, it will be banned (meaning if""<br>" ! "the user connects from that ident@ip, he will NOT be allowed to log in,""<br>" ! "even if there is a different IP below that would let him in).""<br>" ! "<br>" ! "The file can contain comments following each IP. Separate the comment""<br>" ! "from the IP with spaces/tabs followed by the # character. Exmp:""<br>" ! "!1.2.3.4 #this user is not allowed to connect from this ip""<br>" ! "2.3.4. #user's home ip mask (same as 2.3.4.*)""<br>")); ! ! command = addCommand(category, "site chgrp <user> <group> [<group>]"); ! addTextToElement(command, "Description", i18n("Adds/removes a user from group(s)")); ! addTextToElement(command, "Whats This", i18n( ! "Adds/removes a user from group(s)""<br>" ! "<i>Example:</i> site chgrp archimede ftp""<br>" ! "This would change the group to 'ftp' for the user 'archimede'.""<br>" ! "<br>" ! "ex1. site chgrp archimede ftp""<br>" ! "This would remove the group ftp from the user 'archimede'.""<br>" ! "<br>" ! "ex2. site chgrp archimede ftp eleet""<br>" ! "This moves archimede from ftp group to eleet group.""<br>" ! "<br>" ! "<b>NOTE:</b> When adding a user to a group the group must have available slots""<br>" ! "left, even when you are a siteop.""<br>")); ! ! command = addCommand(category, "site chmod <mask> <pathname>"); ! addTextToElement(command, "Description", i18n("Changes a file's permissions to mask")); ! addTextToElement(command, "Whats This", i18n( ! "Changes a file's permissions to mask""<br>" ! "<i>Example:</i> site chmod 444 file.zip""<br>" ! "<i>Example:</i> site chmod 777 /site/incoming""<br>")); ! ! command = addCommand(category, "site color [on/off/show]"); ! addTextToElement(command, "Description", i18n("Enable/Disable the use of colors")); ! addTextToElement(command, "Whats This", i18n( ! "Enable/Disable the use of colors""<br>" ! "<br>" ! "If no arguments are specified, this will toggle color.""<br>" ! "<br>" ! "<b>NOTE:</b> This will screw up many windows clients if enabled""<br>")); ! ! command = addCommand(category, "site delip <user> <ident@ip> ..."); ! addTextToElement(command, "Description", i18n("Delete IP from user, you can also use the ip number")); ! addTextToElement(command, "Whats This", i18n( ! "Delete IP from user, you can also use the ip number""<br>" ! "(Takes up to 10 arguments)""<br>" ! "<br>" ! "<i>Example:</i> site delip Archimede Archimede@127.0.0.1""<br>" ! "<br>" ! "This would remove the ident@ip 'Archimede@127.0.0.1' from the""<br>" ! "user 'Archimede'.""<br>" ! "<br>" ! "<i>Example:</i> site delip Archimede 1""<br>" ! "<br>" ! "This would remove ident@ip #1 from the user 'Archimede'.""<br>" ! "(Get list with site user <user>)""<br>")); ! ! command = addCommand(category, "site errlog [<number>] [<searchstring>]"); ! addTextToElement(command, "Description", i18n("Display the error log")); ! addTextToElement(command, "Whats This", i18n( ! "Display the error log""<br>" ! "<br>" ! "This displays '/glftpd/ftp-data/logs/error.log'""<br>" ! "See info about \"site syslog\" for syntax.""<br>")); ! ! command = addCommand(category, "site gadduser <group> <user> <password> [<ident@ip#1 .. ident@ip#5>]"); ! addTextToElement(command, "Description", i18n("Adds a user and changes his/her group to <group>")); ! addTextToElement(command, "Whats This", i18n( ! "Adds a user and changes his/her group to <group>""<br>" ! "If default.group exists, it will be used as a base instead of default.user.""<br>" ! "<br>" ! "Only public groups can be used as <group>.""<br>" ! "<br>" ! "<b>NOTE:</b> When adding a user to a group the group must have available slots""<br>" ! "left, even when you are a siteop.""<br>")); ! ! command = addCommand(category, "site give <user> <kbytes>[gGmM] [<message>]"); ! addTextToElement(command, "Description", i18n("Gives credits to user (Taken from you")); ! addTextToElement(command, "Whats This", i18n( ! "Gives credits to user (Taken from you""<br>" ! "<br>" ! "<i>Example:</i> site give Archimede 100000 there you go""<br>" ! "The optional g/m suffix will take the number to be gigabytes or megabytes.""<br>" ! "This will give around 100mb of credits to user 'Archimede' and send""<br>" ! "the message 'there you go'.""<br>")); ! ! command = addCommand(category, "site grpren <groupname> <NEWgroupname>"); ! addTextToElement(command, "Description", i18n("Rename a group")); ! addTextToElement(command, "Whats This", i18n( ! "Rename a group""<br>" ! "<br>" ! "<i>Example:</i> site grpren ftp new_ftp""<br>" ! "<br>" ! "This would change the group name 'ftp' to 'new_ftp'.""<br>" ! "All users in group 'ftp' will now automatically belong to 'new_ftp'.""<br>")); ! ! command = addCommand(category, "site kill <pid>"); ! addTextToElement(command, "Description", i18n("Kill a PID")); ! addTextToElement(command, "Whats This", i18n( ! "Kill a PID""<br>" ! "<br>" ! "<i>Example:</i> site kill 345""<br>" ! "<br>" ! "This will kill pid# 345 (if it belongs to a glftpd user).""<br>")); ! ! command = addCommand(category, "site nuke <directory> <multiplier> <message>"); ! addTextToElement(command, "Description", i18n("Nuke a director")); ! addTextToElement(command, "Whats This", i18n( ! "Nuke a director""<br>" ! "<br>" ! "<i>Example:</i> site nuke shit 2 CRAP""<br>" ! "<br>" ! "This will nuke the directory 'shit' and remove x2 credits with the""<br>" ! "comment 'CRAP'.""<br>" ! "<br>" ! "<b>NOTE:</b> You can enclose the directory in braces if you have spaces in the name""<br>" ! "<i>Example:</i> site NUKE {My directory name} 1 because_i_dont_like_it""<br>")); ! ! command = addCommand(category, "site new [.] [<#>]"); ! addTextToElement(command, "Description", i18n("Display newest created directories (taken from dirlog)")); ! addTextToElement(command, "Whats This", i18n( ! "Display newest created directories (taken from dirlog)""<br>" ! "<br>" ! "<i>Example:</i> site new""<br>" ! "This will display the 10 newest directories.""<br>" ! "<br>" ! "<i>Example:</i> site new .""<br>" ! "This will show new directories in the current dir tree""<br>" ! "<br>" ! "<i>Example:</i> site new 40""<br>" ! "This will display the 40 newest directories everywhere.""<br>" ! "<br>" ! "<i>Example:</i> site new . 20""<br>" ! "This will show the last 20 dirs made in the current dir tree.""<br>" ! "<br>" ! "<b>NOTE:</b> Users are only able to see directories created under""<br>" ! "their home directory. If your homedir is /site/public, you will""<br>" ! "not see directories created in /site/private by using site new.""<br>" ! "To achieve this, you need to set up a %NEW cookie in a text file""<br>" ! "with /site/private as a parameter, and use msgpath or a custom""<br>" ! "command to display it.""<br>")); ! ! command = addCommand(category, "site onel [<string>]"); ! addTextToElement(command, "Description", i18n("Show/Add oneliner")); ! addTextToElement(command, "Whats This", i18n( ! "Show/Add oneliner""<br>" ! "<br>" ! "<i>Example:</i> site onel""<br>" ! "<br>" ! "This will display the current oneliners.""<br>" ! "<br>" ! "<i>Example:</i> site onel Archimede was here""<br>" ! "<br>" ! "This will add 'Archimede was here' to the oneliners.""<br>")); ! ! command = addCommand(category, "site renuser <old_username> <new_username>"); ! addTextToElement(command, "Description", i18n("Rename a use")); ! addTextToElement(command, "Whats This", i18n( ! "Rename a use""<br>" ! "<br>" ! "<i>Example:</i> site renuser usurper Usurper""<br>" ! "This will make usurper look bigger and meaner""<br>")); ! ! command = addCommand(category, "site request [<string>]"); ! addTextToElement(command, "Description", i18n("Add/Display Requests")); ! addTextToElement(command, "Whats This", i18n( ! "Add/Display Requests""<br>" ! "<br>" ! "<i>Example:</i> site request""<br>" ! "<br>" ! "This will display the current requests.""<br>" ! "<br>" ! "<i>Example:</i> site request A new super-duper-fast computer!""<br>" ! "<br>" ! "This will add my request to the requestlist.""<br>" ! "<br>" ! "If logging is enabled, new requests are logged to glftpd.log""<br>")); ! ! command = addCommand(category, "site reqfilled <#>"); ! addTextToElement(command, "Description", i18n("Fill a request")); ! addTextToElement(command, "Whats This", i18n( ! "Fill a request""<br>" ! "<br>" ! "<i>Example:</i> site reqfilled 3""<br>" ! "<br>" ! "This will remove request number 3 from the request list and send""<br>" ! "mail to the user who made the request saying you filled it.""<br>" ! "(List requests with site request)""<br>" ! "<br>" ! "If logging is enabled, filled requests get logged to glftpd.log.""<br>" ! "They are also always logged to request.log.""<br>")); ! ! command = addCommand(category, "site reqlog [<number>] [<searchstring>]"); ! addTextToElement(command, "Description", i18n("Show the log of filled requests")); ! addTextToElement(command, "Whats This", i18n( ! "Show the log of filled requests""<br>" ! "<br>" ! "This displays '/glftpd/ftp-data/logs/request.log'""<br>" ! "See info about \"site syslog\" for syntax.""<br>")); ! ! command = addCommand(category, "site search <string> [<string2> ...]"); ! addTextToElement(command, "Description", i18n("Searches the entire site for matching directory names")); ! addTextToElement(command, "Whats This", i18n( ! "Searches the entire site for matching directory names""<br>" ! "<br>" ! "(ftp-data/logs/dirlog is what's being searched. If this command""<br>" ! "finds old non-existing directories, you need to run the""<br>" ! "\"olddirclean2\" utility to clean your dirlog. Best run it from crontab.)""<br>" ! "<br>" ! "<i>Example:</i> site search quake""<br>" ! "This will search the entire site for directories containing the""<br>" ! "string 'quake'. The search is NOT case-sensitive.""<br>" ! "<br>" ! "<i>Example:</i> site search linux gnu""<br>" ! "This will find all directories that contain both \"linux\" and \"gnu\"""<br>")); ! ! command = addCommand(category, "site tagline [<tagline>]"); ! addTextToElement(command, "Description", i18n("Shows/Sets your taglin")); ! addTextToElement(command, "Whats This", i18n( ! "Shows/Sets your taglin""<br>" ! "<br>" ! "<i>Example:</i> site tagline""<br>" ! "<br>" ! "This will show your current tagline.""<br>" ! "<br>" ! "<i>Example:</i> site tagline Archimede owns""<br>" ! "<br>" ! "This will set your tagline to 'Archimede owns'.""<br>")); ! ! command = addCommand(category, "site take <user> <kbytes>[gGmM] [<message>]"); ! addTextToElement(command, "Description", i18n("Removes credit from use")); ! addTextToElement(command, "Whats This", i18n( ! "Removes credit from user""<br>" ! "<br>" ! "<i>Example:</i> site take Archimede 100000 haha""<br>" ! "The optional g/m suffix will take the number to be gigabytes or megabytes.""<br>" ! "This will remove 100mb of credits from the user 'Archimede' and""<br>" ! "send the message haha to him.""<br>")); ! ! command = addCommand(category, "site users [keyword|flag|=group|usernam*]"); ! addTextToElement(command, "Description", i18n("Lists users and shows their group, ul stats, dl stats, and credits")); ! addTextToElement(command, "Whats This", i18n( ! "Lists users and shows their group, ul stats, dl stats, and credits""<br>" ! "<br>" ! "Use a keyword to limit the display to specific users.""<br>" ! "A keyword can be: deleted,siteop,gadmin,leech,anonymous,glock,exempt,""<br>" ! "useredit,nuke,unnuke,undupe,kick,kill,take,give,users,idler.""<br>" ! "<br>" ! "Specifying a group's name instead of a keyword will only list users""<br>" ! "that belong to that group. Specifying a flag will only lists users with""<br>" ! "that flag. Exmp: site users 1 (list all siteops), site users 5 (all""<br>" ! "users with color turned on), site users =STAFF (all users in group""<br>" ! "STAFF).""<br>" ! "<br>" ! "You can use partial username with a * at the end to find all users""<br>" ! "whose name starts with those letters. <i>Example:</i> site users f*""<br>" ! "This will find frank, frog, etc.""<br>")); ! ! command = addCommand(category, "site update <string>"); ! addTextToElement(command, "Description", i18n("Adds all dirs matching <string> in current directory to irlog (for \"site new\")")); ! addTextToElement(command, "Whats This", i18n( ! "Adds all dirs matching <string> in current directory to irlog (for \"site new\")""<br>" ! "<br>" ! "<i>Example:</i> site update A*""<br>" ! "<br>" ! "This will add all directories in current path that start with A to the dirlog.""<br>")); ! ! command = addCommand(category, "site syslog [<number>] [<searchstring>]"); ! addTextToElement(command, "Description", i18n("Display the user changes log (ftp-data/logs/sysop.log)")); ! addTextToElement(command, "Whats This", i18n( ! "Display the user changes log (ftp-data/logs/sysop.log)""<br>" ! "<br>" ! "If you don't specify a number, the whole log will be shown.""<br>" ! "If you do specify a number, it will only show changes that number of days old.""<br>" ! "<i>Example:</i> site syslog 5""<br>" ! "<br>" ! "If you specify a searchstring, only entries containing that string will be shown.""<br>" ! "<i>Example:</i> site syslog 10 deleted""<br>" ! "<i>Example:</i> site syslog added -OR- site syslog 0 added""<br>")); ! ! command = addCommand(category, "site unnuke <directory> <message>"); ! addTextToElement(command, "Description", i18n("Unnuke a directory")); ! addTextToElement(command, "Whats This", i18n( ! "Unnuke a directory""<br>" ! "<br>" ! "<i>Example:</i> site unnuke shit NOT CRAP""<br>" ! "<br>" ! "This will unnuke the directory 'shit' with the comment 'NOT CRAP'.""<br>" ! "<br>" ! "<b>NOTE:</b> You can enclose the directory in braces if you have spaces in the name""<br>" ! "<i>Example:</i> site unnuke {My directory name} justcause""<br>" ! "<br>" ! "You need to configure glftpd to keep nuked files if you want to unnuke.""<br>" ! "See the section about glftpd.conf.""<br>")); ! ! command = addCommand(category, "site undupe <string>"); ! addTextToElement(command, "Description", i18n("Remove filename(s) from ftp-data/logs/dupefil")); ! addTextToElement(command, "Whats This", i18n( ! "Remove filename(s) from ftp-data/logs/dupefil""<br>" ! "<br>" ! "<i>Example:</i> site undupe cls*""<br>" ! "<br>" ! "This will remove all files that start with the string 'cls' from""<br>" ! "the dupe database.""<br>")); ! ! command = addCommand(category, "site predupe <filename>"); ! addTextToElement(command, "Description", i18n("Adds <filename> to the dupefile database, so that it can't e uploaded.")); ! addTextToElement(command, "Whats This", i18n( ! "Adds <filename> to the dupefile database, so that it can't e uploaded.""<br>" ! "<br>" ! "Users need access to -predupe in glftpd.conf to use this.""<br>" ! "<br>" ! "Files that match those listed under ignore_type in glftpd.conf will""<br>" ! "not be added.""<br>")); ! ! command = addCommand(category, "site wipe [-r] <file/directory>"); ! addTextToElement(command, "Description", ""); ! addTextToElement(command, "Whats This", i18n( ! "This is similar to the UNIX rm command.""<br>" ! "In glftpd, if you just delete a file, the uploader loses credits and""<br>" ! "upload stats for it. There are many people who didn't like that and""<br>" ! "were unable/too lazy to write a shell script to do it for them, so I""<br>" ! "wrote this command to get them off my back.""<br>" ! "<br>" ! "If the argument is a file, it will simply be deleted. If it's a""<br>" ! "directory, it and the files it contains will be deleted. If the""<br>" ! "directory contains other directories, the deletion will be aborted.""<br>" ! "<br>" ! "To remove a directory containing subdirectories, you need to use""<br>" ! "\"site wipe -r dirname\". BE CAREFUL WHO YOU GIVE ACCESS TO THIS COMMAND.""<br>" ! "Glftpd will check if the parent directory of the file/directory you're""<br>" ! "trying to delete is writable by its owner. If not, wipe will not""<br>" ! "execute, so to protect directories from being wiped, make their parent""<br>" ! "555.""<br>" ! "<br>" ! "Also, wipe will only work where you have the right to delete (in""<br>" ! "glftpd.conf). Delete right and parent directory's mode of 755/777/etc""<br>" ! "will cause glftpd to SWITCH TO ROOT UID and wipe the file/directory.""<br>" ! "\"site wipe -r /\" will not work, but \"site wipe -r /incoming\" WILL, SO""<br>" ! "BE CAREFUL.""<br>" ! "<br>" ! "This command will remove the deleted files/directories from the dirlog""<br>" ! "and dupefile databases.""<br>" ! "<br>" ! "To give access to this command, add \"-wipe -user flag =group\" to the""<br>" ! "config file (similar to other site commands).""<br>" ! "<br>" ! "<b>NOTE:</b> The two commands below require unzip to reside in the /bin directory""<br>" ! "(it's /bin in the chroot'ed environment, so /glftpd/bin in reality)""<br>")); ! ! command = addCommand(category, "site xdupe [mode]"); ! addTextToElement(command, "Description", ""); ! addTextToElement(command, "Whats This", i18n( ! "If mode is present, xdupe mode will be set to it. If not, glftpd will""<br>" ! "print currently set mode.""<br>" ! "<br>" ! "Xdupe will allow clients that keep queues of files to be uploaded to""<br>" ! "quickly remove files from their queue if they already exist on""<br>" ! "the glftpd site, without the need to refresh. This should minimize the""<br>" ! "number of 'dupe' errors as clients try to upload files that have""<br>" ! "already been uploaded by someone else to the current directory. When""<br>" ! "this is turned on (through 'site xdupe'), glftpd will give a list of""<br>" ! "files, preceded by the string \"X-DUPE:\", right before the usual \"this\"""<br>" ! "file is a dupe message. The files are first matched against a list""<br>" ! "of file masks on the \"xdupe\" line in glftpd.conf. See the included""<br>" ! "x-dupe-info.txt for more details. Currently, pftp is the only client""<br>" ! "which supports this feature.""<br>" ! "<br>" ! "example config file entry:""<br>" ! "xdupe *.zip *.rar *.r[0-9][0-9] *.gz *.tgz *.arj""<br>")); // command = addCommand(category, ""); --- 617,1055 ---- "Shows detailed information about users online""<br>")); ! // category = addCategory(server, "implement in dialog"); ! // ! // command = addCommand(category, "site adduser <user> <password> [<ident@ip>]"); ! // addTextToElement(command, "Description", i18n("Adds a user")); ! // addTextToElement(command, "Whats This", i18n( ! // "Adds a user. You can have wild cards for users that have dynamic ips<br>" ! // "<i>Examples:</i> *@192.168.1.* , frank@192.168.*.* , bob@192.*.*.*<br>" ! // "(*@192.168.1.1[5-9] will allow only 192.168.1.15-19 to connect but no one else)<br>" ! // "<br>" ! // "If a user is added by a groupadmin, that user will have the GLOCK<br>" ! // "flag enabled and will inherit the home directory from the default.user<br>" ! // "or default.<groupname> file.<br>" ! // "<br>" ! // "All default values for the user are read from file default.user in<br>" ! // "/glftpd/ftp-data/users. Comments inside describe what is what.<br>" ! // "Gadmins can be assigned their own default.<group> userfiles<br>" ! // "as templates to be used when they add a user, if one is not found,<br>" ! // "default.user will be used.<br>" ! // "default.groupname files will also be used for \"site gadduser\"." ! // "<br>" ! // "<i>Example:</i> site ADDUSER Archimede mypassword""<br>" ! // "This would add the user 'Archimede' with the password 'mypassword'.""<br>" ! // "<br>" ! // "<i>Example:</i> site ADDUSER Archimede mypassword *@127.0.0.1""<br>" ! // "<br>" ! // "This would do the same as above + add the ip '*@127.0.0.1' at the""<br>" ! // "same time.""<br>" ! // "<br>" ! // "HOMEDIRS:""<br>" ! // "After login, the user will automatically be transferred into his/her""<br>" ! // "homedir. As of 1.16.x this dir is now \"kinda\" chroot'ed and they are""<br>" ! // "now unable to \"cd ..\".*/""<br>")); ! // ! // command = addCommand(category, "site addip <user> <ident@ip#1 ... ident@ip#10>"); ! // addTextToElement(command, "Description", i18n("Add IP to user")); ! // addTextToElement(command, "Whats This", i18n( ! // "Add IP to user""<br>" ! // "<br>" ! // "Note: if you don't know what ident is, you need to read your""<br>" ! // "internet-for-dummies book first.""<br>" ! // "<br>" ! // "<i>Example:</i> site addip Archimede Archimede@127.0.0.1 *@10.10.""<br>" ! // "This would add the ident@ip 'Archimede@127.0.0.1' and mask '*@10.10.*'""<br>" ! // "to user 'Archimede'. (* at the end is optional in this case)""<br>" ! // "<br>" ! // "<i>Example:</i> site addip Archimede Arc...@bl... Archimede@209.44.* *@24.1.64.20""<br>" ! // "This would add all 3 ip masks to user 'Archimede'.""<br>" ! // "<br>" ! // "<i>Example:</i> site addip lamer someident@3.1.2.1[2-5]?""<br>" ! // "This mask will match IPs 3.1.2.120 through 3.1.2.159""<br>" ! // "Warning: You can't use [] to declare range of numbers > 9, so [10-79]""<br>" ! // "will not work. Use [1-7]? or [1-7][0-9] instead. Ranges that don't start""<br>" ! // "at a power of 10 or don't end at 9 are not possible unless you add""<br>" ! // "more than 1 mask.""<br>" ! // "<br>" ! // "<b>NOTE:</b> There is a maximum of 10 IPs that can go into the userfile.""<br>" ! // "If you need more than 10, you need to add them to a text file, each one""<br>" ! // "on a line by itself, in the format ident@ip. To make glftpd use this""<br>" ! // "file, the first IP in the userfile (IP0 in site user) has to look like""<br>" ! // "this:""<br>" ! // "IP !/path/to/iplist.txt""<br>" ! // "Glftpd won't let you add an IP like that; you need to edit the userfile""<br>" ! // "manually (in /glftpd/ftp-data/users) and add it.""<br>" ! // "Make sure there are no DOS carriage returns at the end of each line in""<br>" ! // "the file containing the list of IPs.""<br>" ! // "If an entry in that file starts with !, it will be banned (meaning if""<br>" ! // "the user connects from that ident@ip, he will NOT be allowed to log in,""<br>" ! // "even if there is a different IP below that would let him in).""<br>" ! // "<br>" ! // "The file can contain comments following each IP. Separate the comment""<br>" ! // "from the IP with spaces/tabs followed by the # character. Exmp:""<br>" ! // "!1.2.3.4 #this user is not allowed to connect from this ip""<br>" ! // "2.3.4. #user's home ip mask (same as 2.3.4.*)""<br>")); ! // ! // command = addCommand(category, "site chgrp <user> <group> [<group>]"); ! // addTextToElement(command, "Description", i18n("Adds/removes a user from group(s)")); ! // addTextToElement(command, "Whats This", i18n( ! // "Adds/removes a user from group(s)""<br>" ! // "<i>Example:</i> site chgrp archimede ftp""<br>" ! // "This would change the group to 'ftp' for the user 'archimede'.""<br>" ! // "<br>" ! // "ex1. site chgrp archimede ftp""<br>" ! // "This would remove the group ftp from the user 'archimede'.""<br>" ! // "<br>" ! // "ex2. site chgrp archimede ftp eleet""<br>" ! // "This moves archimede from ftp group to eleet group.""<br>" ! // "<br>" ! // "<b>NOTE:</b> When adding a user to a group the group must have available slots""<br>" ! // "left, even when you are a siteop.""<br>")); ! // ! // command = addCommand(category, "site chmod <mask> <pathname>"); ! // addTextToElement(command, "Description", i18n("Changes a file's permissions to mask")); ! // addTextToElement(command, "Whats This", i18n( ! // "Changes a file's permissions to mask""<br>" ! // "<i>Example:</i> site chmod 444 file.zip""<br>" ! // "<i>Example:</i> site chmod 777 /site/incoming""<br>")); ! // ! // command = addCommand(category, "site color [on/off/show]"); ! // addTextToElement(command, "Description", i18n("Enable/Disable the use of colors")); ! // addTextToElement(command, "Whats This", i18n( ! // "Enable/Disable the use of colors""<br>" ! // "<br>" ! // "If no arguments are specified, this will toggle color.""<br>" ! // "<br>" ! // "<b>NOTE:</b> This will screw up many windows clients if enabled""<br>")); ! // ! // command = addCommand(category, "site delip <user> <ident@ip> ..."); ! // addTextToElement(command, "Description", i18n("Delete IP from user, you can also use the ip number")); ! // addTextToElement(command, "Whats This", i18n( ! // "Delete IP from user, you can also use the ip number""<br>" ! // "(Takes up to 10 arguments)""<br>" ! // "<br>" ! // "<i>Example:</i> site delip Archimede Archimede@127.0.0.1""<br>" ! // "<br>" ! // "This would remove the ident@ip 'Archimede@127.0.0.1' from the""<br>" ! // "user 'Archimede'.""<br>" ! // "<br>" ! // "<i>Example:</i> site delip Archimede 1""<br>" ! // "<br>" ! // "This would remove ident@ip #1 from the user 'Archimede'.""<br>" ! // "(Get list with site user <user>)""<br>")); ! // ! // command = addCommand(category, "site errlog [<number>] [<searchstring>]"); ! // addTextToElement(command, "Description", i18n("Display the error log")); ! // addTextToElement(command, "Whats This", i18n( ! // "Display the error log""<br>" ! // "<br>" ! // "This displays '/glftpd/ftp-data/logs/error.log'""<br>" ! // "See info about \"site syslog\" for syntax.""<br>")); ! // ! // command = addCommand(category, "site gadduser <group> <user> <password> [<ident@ip#1 .. ident@ip#5>]"); ! // addTextToElement(command, "Description", i18n("Adds a user and changes his/her group to <group>")); ! // addTextToElement(command, "Whats This", i18n( ! // "Adds a user and changes his/her group to <group>""<br>" ! // "If default.group exists, it will be used as a base instead of default.user.""<br>" ! // "<br>" ! // "Only public groups can be used as <group>.""<br>" ! // "<br>" ! // "<b>NOTE:</b> When adding a user to a group the group must have available slots""<br>" ! // "left, even when you are a siteop.""<br>")); ! // ! // command = addCommand(category, "site give <user> <kbytes>[gGmM] [<message>]"); ! // addTextToElement(command, "Description", i18n("Gives credits to user (Taken from you")); ! // addTextToElement(command, "Whats This", i18n( ! // "Gives credits to user (Taken from you""<br>" ! // "<br>" ! // "<i>Example:</i> site give Archimede 100000 there you go""<br>" ! // "The optional g/m suffix will take the number to be gigabytes or megabytes.""<br>" ! // "This will give around 100mb of credits to user 'Archimede' and send""<br>" ! // "the message 'there you go'.""<br>")); ! // ! // command = addCommand(category, "site grpren <groupname> <NEWgroupname>"); ! // addTextToElement(command, "Description", i18n("Rename a group")); ! // addTextToElement(command, "Whats This", i18n( ! // "Rename a group""<br>" ! // "<br>" ! // "<i>Example:</i> site grpren ftp new_ftp""<br>" ! // "<br>" ! // "This would change the group name 'ftp' to 'new_ftp'.""<br>" ! // "All users in group 'ftp' will now automatically belong to 'new_ftp'.""<br>")); ! // ! // command = addCommand(category, "site kill <pid>"); ! // addTextToElement(command, "Description", i18n("Kill a PID")); ! // addTextToElement(command, "Whats This", i18n( ! // "Kill a PID""<br>" ! // "<br>" ! // "<i>Example:</i> site kill 345""<br>" ! // "<br>" ! // "This will kill pid# 345 (if it belongs to a glftpd user).""<br>")); ! // ! // command = addCommand(category, "site nuke <directory> <multiplier> <message>"); ! // addTextToElement(command, "Description", i18n("Nuke a director")); ! // addTextToElement(command, "Whats This", i18n( ! // "Nuke a director""<br>" ! // "<br>" ! // "<i>Example:</i> site nuke shit 2 CRAP""<br>" ! // "<br>" ! // "This will nuke the directory 'shit' and remove x2 credits with the""<br>" ! // "comment 'CRAP'.""<br>" ! // "<br>" ! // "<b>NOTE:</b> You can enclose the directory in braces if you have spaces in the name""<br>" ! // "<i>Example:</i> site NUKE {My directory name} 1 because_i_dont_like_it""<br>")); ! // ! // command = addCommand(category, "site new [.] [<#>]"); ! // addTextToElement(command, "Description", i18n("Display newest created directories (taken from dirlog)")); ! // addTextToElement(command, "Whats This", i18n( ! // "Display newest created directories (taken from dirlog)""<br>" ! // "<br>" ! // "<i>Example:</i> site new""<br>" ! // "This will display the 10 newest directories.""<br>" ! // "<br>" ! // "<i>Example:</i> site new .""<br>" ! // "This will show new directories in the current dir tree""<br>" ! // "<br>" ! // "<i>Example:</i> site new 40""<br>" ! // "This will display the 40 newest directories everywhere.""<br>" ! // "<br>" ! // "<i>Example:</i> site new . 20""<br>" ! // "This will show the last 20 dirs made in the current dir tree.""<br>" ! // "<br>" ! // "<b>NOTE:</b> Users are only able to see directories created under""<br>" ! // "their home directory. If your homedir is /site/public, you will""<br>" ! // "not see directories created in /site/private by using site new.""<br>" ! // "To achieve this, you need to set up a %NEW cookie in a text file""<br>" ! // "with /site/private as a parameter, and use msgpath or a custom""<br>" ! // "command to display it.""<br>")); ! // ! // command = addCommand(category, "site onel [<string>]"); ! // addTextToElement(command, "Description", i18n("Show/Add oneliner")); ! // addTextToElement(command, "Whats This", i18n( ! // "Show/Add oneliner""<br>" ! // "<br>" ! // "<i>Example:</i> site onel""<br>" ! // "<br>" ! // "This will display the current oneliners.""<br>" ! // "<br>" ! // "<i>Example:</i> site onel Archimede was here""<br>" ! // "<br>" ! // "This will add 'Archimede was here' to the oneliners.""<br>")); ! // ! // command = addCommand(category, "site renuser <old_username> <new_username>"); ! // addTextToElement(command, "Description", i18n("Rename a use")); ! // addTextToElement(command, "Whats This", i18n( ! // "Rename a use""<br>" ! // "<br>" ! // "<i>Example:</i> site renuser usurper Usurper""<br>" ! // "This will make usurper look bigger and meaner""<br>")); ! // ! // command = addCommand(category, "site request [<string>]"); ! // addTextToElement(command, "Description", i18n("Add/Display Requests")); ! // addTextToElement(command, "Whats This", i18n( ! // "Add/Display Requests""<br>" ! // "<br>" ! // "<i>Example:</i> site request""<br>" ! // "<br>" ! // "This will display the current requests.""<br>" ! // "<br>" ! // "<i>Example:</i> site request A new super-duper-fast computer!""<br>" ! // "<br>" ! // "This will add my request to the requestlist.""<br>" ! // "<br>" ! // "If logging is enabled, new requests are logged to glftpd.log""<br>")); ! // ! // command = addCommand(category, "site reqfilled <#>"); ! // addTextToElement(command, "Description", i18n("Fill a request")); ! // addTextToElement(command, "Whats This", i18n( ! // "Fill a request""<br>" ! // "<br>" ! // "<i>Example:</i> site reqfilled 3""<br>" ! // "<br>" ! // "This will remove request number 3 from the request list and send""<br>" ! // "mail to the user who made the request saying you filled it.""<br>" ! // "(List requests with site request)""<br>" ! // "<br>" ! // "If logging is enabled, filled requests get logged to glftpd.log.""<br>" ! // "They are also always logged to request.log.""<br>")); ! // ! // command = addCommand(category, "site reqlog [<number>] [<searchstring>]"); ! // addTextToElement(command, "Description", i18n("Show the log of filled requests")); ! // addTextToElement(command, "Whats This", i18n( ! // "Show the log of filled requests""<br>" ! // "<br>" ! // "This displays '/glftpd/ftp-data/logs/request.log'""<br>" ! // "See info about \"site syslog\" for syntax.""<br>")); ! // ! // command = addCommand(category, "site search <string> [<string2> ...]"); ! // addTextToElement(command, "Description", i18n("Searches the entire site for matching directory names")); ! // addTextToElement(command, "Whats This", i18n( ! // "Searches the entire site for matching directory names""<br>" ! // "<br>" ! // "(ftp-data/logs/dirlog is what's being searched. If this command""<br>" ! // "finds old non-existing directories, you need to run the""<br>" ! // "\"olddirclean2\" utility to clean your dirlog. Best run it from crontab.)""<br>" ! // "<br>" ! // "<i>Example:</i> site search quake""<br>" ! // "This will search the entire site for directories containing the""<br>" ! // "string 'quake'. The search is NOT case-sensitive.""<br>" ! // "<br>" ! // "<i>Example:</i> site search linux gnu""<br>" ! // "This will find all directories that contain both \"linux\" and \"gnu\"""<br>")); ! // ! // command = addCommand(category, "site tagline [<tagline>]"); ! // addTextToElement(command, "Description", i18n("Shows/Sets your taglin")); ! // addTextToElement(command, "Whats This", i18n( ! // "Shows/Sets your taglin""<br>" ! // "<br>" ! // "<i>Example:</i> site tagline""<br>" ! // "<br>" ! // "This will show your current tagline.""<br>" ! // "<br>" ! // "<i>Example:</i> site tagline Archimede owns""<br>" ! // "<br>" ! // "This will set your tagline to 'Archimede owns'.""<br>")); ! // ! // command = addCommand(category, "site take <user> <kbytes>[gGmM] [<message>]"); ! // addTextToElement(command, "Description", i18n("Removes credit from use")); ! // addTextToElement(command, "Whats This", i18n( ! // "Removes credit from user""<br>" ! // "<br>" ! // "<i>Example:</i> site take Archimede 100000 haha""<br>" ! // "The optional g/m suffix will take the number to be gigabytes or megabytes.""<br>" ! // "This will remove 100mb of credits from the user 'Archimede' and""<br>" ! // "send the message haha to him.""<br>")); ! // ! // command = addCommand(category, "site users [keyword|flag|=group|usernam*]"); ! // addTextToElement(command, "Description", i18n("Lists users and shows their group, ul stats, dl stats, and credits")); ! // addTextToElement(command, "Whats This", i18n( ! // "Lists users and shows their group, ul stats, dl stats, and credits""<br>" ! // "<br>" ! // "Use a keyword to limit the display to specific users.""<br>" ! // "A keyword can be: deleted,siteop,gadmin,leech,anonymous,glock,exempt,""<br>" ! // "useredit,nuke,unnuke,undupe,kick,kill,take,give,users,idler.""<br>" ! // "<br>" ! // "Specifying a group's name instead of a keyword will only list users""<br>" ! // "that belong to that group. Specifying a flag will only lists users with""<br>" ! // "that flag. Exmp: site users 1 (list all siteops), site users 5 (all""<br>" ! // "users with color turned on), site users =STAFF (all users in group""<br>" ! // "STAFF).""<br>" ! // "<br>" ! // "You can use partial username with a * at the end to find all users""<br>" ! // "whose name starts with those letters. <i>Example:</i> site users f*""<br>" ! // "This will find frank, frog, etc.""<br>")); ! // ! // command = addCommand(category, "site update <string>"); ! // addTextToElement(command, "Description", i18n("Adds all dirs matching <string> in current directory to irlog (for \"site new\")")); ! // addTextToElement(command, "Whats This", i18n( ! // "Adds all dirs matching <string> in current directory to irlog (for \"site new\")""<br>" ! // "<br>" ! // "<i>Example:</i> site update A*""<br>" ! // "<br>" ! // "This will add all directories in current path that start with A to the dirlog.""<br>")); ! // ! // command = addCommand(category, "site syslog [<number>] [<searchstring>]"); ! // addTextToElement(command, "Description", i18n("Display the user changes log (ftp-data/logs/sysop.log)")); ! // addTextToElement(command, "Whats This", i18n( ! // "Display the user changes log (ftp-data/logs/sysop.log)""<br>" ! // "<br>" ! // "If you don't specify a number, the whole log will be shown.""<br>" ! // "If you do specify a number, it will only show changes that number of days old.""<br>" ! // "<i>Example:</i> site syslog 5""<br>" ! // "<br>" ! // "If you specify a searchstring, only entries containing that string will be shown.""<br>" ! // "<i>Example:</i> site syslog 10 deleted""<br>" ! // "<i>Example:</i> site syslog added -OR- site syslog 0 added""<br>")); ! // ! // command = addCommand(category, "site unnuke <directory> <message>"); ! // addTextToElement(command, "Description", i18n("Unnuke a directory")); ! // addTextToElement(command, "Whats This", i18n( ! // "Unnuke a directory""<br>" ! // "<br>" ! // "<i>Example:</i> site unnuke shit NOT CRAP""<br>" ! // "<br>" ! // "This will unnuke the directory 'shit' with the comment 'NOT CRAP'.""<br>" ! // "<br>" ! // "<b>NOTE:</b> You can enclose the directory in braces if you have spaces in the name""<br>" ! // "<i>Example:</i> site unnuke {My directory name} justcause""<br>" ! // "<br>" ! // "You need to configure glftpd to keep nuked files if you want to unnuke.""<br>" ! // "See the section about glftpd.conf.""<br>")); ! // ! // command = addCommand(category, "site undupe <string>"); ! // addTextToElement(command, "Description", i18n("Remove filename(s) from ftp-data/logs/dupefil")); ! // addTextToElement(command, "Whats This", i18n( ! // "Remove filename(s) from ftp-data/logs/dupefil""<br>" ! // "<br>" ! // "<i>Example:</i> site undupe cls*""<br>" ! // "<br>" ! // "This will remove all files that start with the string 'cls' from""<br>" ! // "the dupe database.""<br>")); ! // ! // command = addCommand(category, "site predupe <filename>"); ! // addTextToElement(command, "Description", i18n("Adds <filename> to the dupefile database, so that it can't e uploaded.")); ! // addTextToElement(command, "Whats This", i18n( ! // "Adds <filename> to the dupefile database, so that it can't e uploaded.""<br>" ! // "<br>" ! // "Users need access to -predupe in glftpd.conf to use this.""<br>" ! // "<br>" ! // "Files that match those listed under ignore_type in glftpd.conf will""<br>" ! // "not be added.""<br>")); ! // ! // command = addCommand(category, "site wipe [-r] <file/directory>"); ! // addTextToElement(command, "Description", ""); ! // addTextToElement(command, "Whats This", i18n( ! // "This is similar to the UNIX rm command.""<br>" ! // "In glftpd, if you just delete a file, the uploader loses credits and""<br>" ! // "upload stats for it. There are many people who didn't like that and""<br>" ! // "were unable/too lazy to write a shell script to do it for them, so I""<br>" ! // "wrote this command to get them off my back.""<br>" ! // "<br>" ! // "If the argument is a file, it will simply be deleted. If it's a""<br>" ! // "directory, it and the files it contains will be deleted. If the""<br>" ! // "directory contains other directories, the deletion will be aborted.""<br>" ! // "<br>" ! // "To remove a directory containing subdirectories, you need to use""<br>" ! // "\"site wipe -r dirname\". BE CAREFUL WHO YOU GIVE ACCESS TO THIS COMMAND.""<br>" ! // "Glftpd will check if the parent directory of the file/directory you're""<br>" ! // "trying to delete is writable by its owner. If not, wipe will not""<br>" ! // "execute, so to protect directories from being wiped, make their parent""<br>" ! // "555.""<br>" ! // "<br>" ! // "Also, wipe will only work where you have the right to delete (in""<br>" ! // "glftpd.conf). Delete right and parent directory's mode of 755/777/etc""<br>" ! // "will cause glftpd to SWITCH TO ROOT UID and wipe the file/directory.""<br>" ! // "\"site wipe -r /\" will not work, but \"site wipe -r /incoming\" WILL, SO""<br>" ! // "BE CAREFUL.""<br>" ! // "<br>" ! // "This command will remove the deleted files/directories from the dirlog""<br>" ! // "and dupefile databases.""<br>" ! // "<br>" ! // "To give access to this command, add \"-wipe -user flag =group\" to the""<br>" ! // "config file (similar to other site commands).""<br>" ! // "<br>" ! // "<b>NOTE:</b> The two commands below require unzip to reside in the /bin directory""<br>" ! // "(it's /bin in the chroot'ed environment, so /glftpd/bin in reality)""<br>")); ! // ! // command = addCommand(category, "site xdupe [mode]"); ! // addTextToElement(command, "Description", ""); ! // addTextToElement(command, "Whats This", i18n( ! // "If mode is present, xdupe mode will be set to it. If not, glftpd will""<br>" ! // "print currently set mode.""<br>" ! // "<br>" ! // "Xdupe will allow clients that keep queues of files to be uploaded to""<br>" ! // "quickly remove files from their queue if they already exist on""<br>" ! // "the glftpd site, without the need to refresh. This should minimize the""<br>" ! // "number of 'dupe' errors as clients try to upload files that have""<br>" ! // "already been uploaded by someone else to the current directory. When""<br>" ! // "this is turned on (through 'site xdupe'), glftpd will give a list of""<br>" ! // "files, preceded by the string \"X-DUPE:\", right before the usual \"this\"""<br>" ! // "file is a dupe message. The files are first matched against a list""<br>" ! // "of file masks on the \"xdupe\" line in glftpd.conf. See the included""<br>" ! // "x-dupe-info.txt for more details. Currently, pftp is the only client""<br>" ! // "which supports this feature.""<br>" ! // "<br>" ! // "example config file entry:""<br>" ! // "xdupe *.zip *.rar *.r[0-9][0-9] *.gz *.tgz *.arj""<br>")); // command = addCommand(category, ""); |
|
From: Jernej K. <ko...@us...> - 2005-04-27 15:44:52
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src/widgets/configdialog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13280 Modified Files: kftpconfigdialog.cpp Log Message: Forgotten commit, add thread count setting. Index: kftpconfigdialog.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/widgets/configdialog/kftpconfigdialog.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** kftpconfigdialog.cpp 6 Dec 2004 19:20:43 -0000 1.13 --- kftpconfigdialog.cpp 27 Apr 2005 15:44:43 -0000 1.14 *************** *** 123,126 **** --- 123,127 ---- FTPConfig().m_globalMail = m_configTrans->globalMail->isChecked(); FTPConfig().m_anonMail = m_configTrans->anonMail->text(); + FTPConfig().m_threadCount = m_configTrans->threadCount->value(); // GENERAL *************** *** 172,175 **** --- 173,177 ---- m_configTrans->globalMail->setChecked(FTPConfig().m_globalMail); m_configTrans->anonMail->setText(FTPConfig().m_anonMail); + m_configTrans->threadCount->setValue(FTPConfig().m_threadCount); m_configTrans->slotForceIpClicked(); m_configTrans->slotFreeSpaceClicked(); |
|
From: Jernej K. <ko...@us...> - 2005-04-27 15:42:42
|
Update of /cvsroot/kftpgrabber/kftpgrabber/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11960 Modified Files: cs.po de.po es.po fr.po hu.po kftpgrabber.pot zh_CN.po Log Message: Updated POT file. Index: kftpgrabber.pot =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/po/kftpgrabber.pot,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kftpgrabber.pot 17 Apr 2005 09:00:22 -0000 1.3 --- kftpgrabber.pot 27 Apr 2005 15:42:24 -0000 1.4 *************** *** 8,12 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-01-26 17:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 8,12 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-04-27 17:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" [...3975 lines suppressed...] msgstr "" ! #: widgets/filedirview/kftpfiledirviewactions.cpp:410 msgid "Are you sure you want to delete this file(s)?" msgstr "" ! #: widgets/filedirview/kftpfiledirviewactions.cpp:410 msgid "Delete file" msgstr "" ! #: widgets/filedirview/kftpfiledirviewactions.cpp:479 msgid "Filter" msgstr "" ! #: widgets/filedirview/kftpfiledirviewactions.cpp:504 msgid "Send raw command" msgstr "" #: widgets/filedirview/kftpfilepropsplugin.cpp:52 msgid "&General" Index: es.po =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/po/es.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** es.po 17 Apr 2005 09:00:22 -0000 1.2 --- es.po 27 Apr 2005 15:42:24 -0000 1.3 *************** *** 5,9 **** "Project-Id-Version: kftpgrabber\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-01-26 17:33+0100\n" "PO-Revision-Date: 2004-08-27 16:38+0000\n" "Last-Translator: Edgardo Rossetto <er...@sp...>\n" --- 5,9 ---- "Project-Id-Version: kftpgrabber\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-04-27 17:40+0200\n" "PO-Revision-Date: 2004-08-27 16:38+0000\n" [...4073 lines suppressed...] + #~ msgid "" + #~ "This server name is already in use!\n" + #~ "\n" + #~ "Choose another ;-)" + #~ msgstr "" + #~ "¡El nombre de servidor ya existe!\n" + #~ "\n" + #~ "Elije otro ;-)" + + #~ msgid "Name already in use" + #~ msgstr "El nombre ya está en uso" + + #~ msgid "This connection is NOT secure." + #~ msgstr "Esta conexión NO es segura." + #~ msgid "Settings" #~ msgstr "Preferencias" #~ msgid "&Save settings" #~ msgstr "Guardar preferencias" Index: fr.po =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/po/fr.po,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fr.po 13 Feb 2005 18:49:28 -0000 1.1 --- fr.po 27 Apr 2005 15:42:24 -0000 1.2 *************** *** 9,13 **** "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2004-08-24 17:02+0200\n" "PO-Revision-Date: 2005-02-10 17:22+0100\n" "Last-Translator: mrlag <mr...@bu...>\n" --- 9,13 ---- "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-04-27 17:40+0200\n" "PO-Revision-Date: 2005-02-10 17:22+0100\n" [...4429 lines suppressed...] + #~ msgid "Enter ftp's port" + #~ msgstr "Entrer le port du ftp" + + #~ msgid "" + #~ "This server name is already in use!\n" + #~ "\n" + #~ "Choose another ;-)" + #~ msgstr "" + #~ "Ce nom de serveur est déjà utilisé!\n" + #~ "\n" + #~ "Choisissez en un autre :-)" + + #~ msgid "Name already in use" + #~ msgstr "Nom déjà utilisé" + + #~ msgid "Please enter all required information!" + #~ msgstr "Rentrez toutes les informations requises s'il vous plait!" + + #~ msgid "This connection is NOT secure." + #~ msgstr "Cette connexion n'est PAS sécurisé." Index: de.po =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/po/de.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** de.po 17 Apr 2005 09:00:22 -0000 1.3 --- de.po 27 Apr 2005 15:42:24 -0000 1.4 *************** *** 9,13 **** "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-01-26 17:33+0100\n" "PO-Revision-Date: 2004-09-06 15:23+0200\n" "Last-Translator: Christoph Thielecke <cri...@gm...>\n" --- 9,13 ---- "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-04-27 17:40+0200\n" "PO-Revision-Date: 2004-09-06 15:23+0200\n" [...4085 lines suppressed...] ! #~ msgid "Download: %1/s Upload: %1/s" ! #~ msgstr "Herunterladen: %1/s Hochladen: %1/s" ! #~ msgid "" ! #~ "This server name is already in use!\n" ! #~ "\n" ! #~ "Choose another ;-)" ! #~ msgstr "" ! #~ "Dieser Servername ist bereits in Benutzung\n" ! #~ "\n" ! #~ "Bitte einen anderen wählen!" ! ! #~ msgid "Name already in use" ! #~ msgstr "Name bereits in Benutzung" ! ! #~ msgid "This connection is NOT secure." ! #~ msgstr "Diese Verbindung ist nicht sicher." #~ msgid "Use different look (read only) account for this server" Index: cs.po =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/po/cs.po,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cs.po 17 Apr 2005 09:01:34 -0000 1.1 --- cs.po 27 Apr 2005 15:42:23 -0000 1.2 *************** *** 2,11 **** msgstr "" "Project-Id-Version: kftpgrabber-0.5.0\n" ! "POT-Creation-Date: n/a\n" "PO-Revision-Date: 2005-04-16 21:23+0100\n" "Last-Translator: Martin Sekera <tra...@ce...>\n" "Language-Team: Czech <cz...@li...>\n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" [...4536 lines suppressed...] ! #~ msgid "&Copy server" ! #~ msgstr "&KopÃrovat server" ! #~ msgid "" ! #~ "This server name is already in use!\n" ! #~ "\n" ! #~ "Choose another ;-)" ! #~ msgstr "" ! #~ "Tento název serveru tu už jednou je!\n" ! #~ "\n" ! #~ "Vyber si jinej ;-)" ! #~ msgid "Name already in use" ! #~ msgstr "Název použÃván" ! #~ msgid "Please enter all required information!" ! #~ msgstr "ProsÃm zadejte vÅ¡echny potÅebné informace!" + #~ msgid "This connection is NOT secure." + #~ msgstr "Toto spojenà NENà bezpeÄné." Index: hu.po =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/po/hu.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hu.po 17 Apr 2005 09:00:22 -0000 1.2 --- hu.po 27 Apr 2005 15:42:24 -0000 1.3 *************** *** 3,7 **** "Project-Id-Version: kftpgrabber\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-01-26 17:33+0100\n" "PO-Revision-Date: 2004-11-02 17:35+0100\n" "Last-Translator: Kroly Barcza (VectoR) <kb...@bl...>\n" --- 3,7 ---- "Project-Id-Version: kftpgrabber\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-04-27 17:40+0200\n" "PO-Revision-Date: 2004-11-02 17:35+0100\n" [...4058 lines suppressed...] - #~ msgid "&Save settings" #~ msgstr "A &beállÃtások mentése" --- 3066,3081 ---- msgstr "Biztosan el szeretné távolÃtani ezt a sablont ?" + #~ msgid "Download: %1/s Upload: %1/s" + #~ msgstr "Letöltés: %1/s Feltöltés: %1/s" + + #~ msgid "Name already in use" + #~ msgstr "A becenév foglalt" + + #~ msgid "This connection is NOT secure." + #~ msgstr "Ez a kapcsolat NEM biztonságos." + #~ msgid "Settings" #~ msgstr "BeállÃtások" #~ msgid "&Save settings" #~ msgstr "A &beállÃtások mentése" Index: zh_CN.po =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/po/zh_CN.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zh_CN.po 21 Apr 2005 15:23:53 -0000 1.2 --- zh_CN.po 27 Apr 2005 15:42:24 -0000 1.3 *************** *** 7,11 **** "Project-Id-Version: zh_CN\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-01-26 17:33+0100\n" "PO-Revision-Date: 2005-04-21 20:28+0800\n" "Last-Translator: éç¶ <hep...@ho...>\n" --- 7,11 ---- "Project-Id-Version: zh_CN\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2005-04-27 17:40+0200\n" "PO-Revision-Date: 2005-04-21 20:28+0800\n" [...4072 lines suppressed...] --- 3066,3084 ---- msgstr "ä½ ç¡®å®è¦å é¤è¿ä¸ªæ¨¡å¼ï¼" + #~ msgid "Download: %1/s Upload: %1/s" + #~ msgstr "ä¸è½½ï¼ %1/s ä¸ä¼ ï¼ %1/s" + + #~ msgid "" + #~ "This server name is already in use!\n" + #~ "\n" + #~ "Choose another ;-)" + #~ msgstr "" + #~ "è¿ä¸ªæå¡å¨åå·²ç»è¢«ä½¿ç¨äºï¼\n" + #~ "\n" + #~ "éä¸ä¸ªå«ç ;-)" + + #~ msgid "Name already in use" + #~ msgstr "å称已被使ç¨" + + #~ msgid "This connection is NOT secure." + #~ msgstr "è¿ä¸ªè¿æ¥ä¸å®å ¨" |
|
From: Blacknator <bla...@us...> - 2005-04-27 14:59:52
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26171 Modified Files: kftpservermanagement.cpp Log Message: removed i18n from xml tags :> Index: kftpservermanagement.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/kftpservermanagement.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** kftpservermanagement.cpp 27 Apr 2005 13:43:59 -0000 1.9 --- kftpservermanagement.cpp 27 Apr 2005 14:59:41 -0000 1.10 *************** *** 98,103 **** // Server GlFTPd - category Change - Info command = addCommand(category, "site idle"); ! addTextToElement(command, i18n("Description"), i18n("Display your idle time")); ! addTextToElement(command, i18n("Whats This"), i18n( "Display your idle time")); --- 98,103 ---- // Server GlFTPd - category Change - Info command = addCommand(category, "site idle"); ! addTextToElement(command, "Description", i18n("Display your idle time")); [...1230 lines suppressed...] "print currently set mode.""<br>" *************** *** 1167,1174 **** // go through of all text nodes in the element for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) { ! if (n.toElement().tagName() == i18n("Description")) { serv->setDescription(n.toElement().text()); } ! if (n.toElement().tagName() == i18n("Whats This")) { serv->setWhatThis(n.toElement().text()); } --- 1167,1174 ---- // go through of all text nodes in the element for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) { ! if (n.toElement().tagName() == "Description") { serv->setDescription(n.toElement().text()); } ! if (n.toElement().tagName() == "Whats This") { serv->setWhatThis(n.toElement().text()); } |
|
From: Blacknator <bla...@us...> - 2005-04-27 13:44:09
|
Update of /cvsroot/kftpgrabber/kftpgrabber/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19636 Modified Files: kftpservermanagement.cpp Log Message: added i18n translation Index: kftpservermanagement.cpp =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/src/kftpservermanagement.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kftpservermanagement.cpp 26 Apr 2005 15:44:47 -0000 1.8 --- kftpservermanagement.cpp 27 Apr 2005 13:43:59 -0000 1.9 *************** *** 39,42 **** --- 39,43 ---- #include <kdebug.h> + #include <klocale.h> #include "misc.h" *************** *** 97,162 **** // Server GlFTPd - category Change - Info command = addCommand(category, "site idle"); [...1562 lines suppressed...] // command = addCommand(category, ""); *************** *** 1165,1172 **** // go through of all text nodes in the element for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) { ! if (n.toElement().tagName() == "Description") { serv->setDescription(n.toElement().text()); } ! if (n.toElement().tagName() == "Whats This") { serv->setWhatThis(n.toElement().text()); } --- 1167,1174 ---- // go through of all text nodes in the element for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) { ! if (n.toElement().tagName() == i18n("Description")) { serv->setDescription(n.toElement().text()); } ! if (n.toElement().tagName() == i18n("Whats This")) { serv->setWhatThis(n.toElement().text()); } |
|
From: Jernej K. <ko...@us...> - 2005-04-27 11:45:09
|
Update of /cvsroot/kftpgrabber/kftpgrabber In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22595 Modified Files: configure.in.in Log Message: Prepare for 0.6.0-beta1. Index: configure.in.in =================================================================== RCS file: /cvsroot/kftpgrabber/kftpgrabber/configure.in.in,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** configure.in.in 9 Mar 2005 16:01:10 -0000 1.23 --- configure.in.in 27 Apr 2005 11:44:42 -0000 1.24 *************** *** 1,5 **** #MIN_CONFIG(3.0.0) ! AM_INIT_AUTOMAKE(kftpgrabber, 0.6.0) dnl Check if QSA is installed --- 1,5 ---- #MIN_CONFIG(3.0.0) ! AM_INIT_AUTOMAKE(kftpgrabber, 0.6.0-beta1) dnl Check if QSA is installed |