From a78329588e05385275b99d457eac7747399f05a0 Mon Sep 17 00:00:00 2001 From: Colum Paget Date: Sat, 14 May 2016 23:22:29 +0100 Subject: [PATCH] documentation changes --- Docs/Proxys.txt | 2 + Makefile | 4 +- config.log | 189 +++++++++++++++++++++-------------------- config.status | 14 +-- libUseful-2.4/Makefile | 4 +- main.c | 4 +- 6 files changed, 115 insertions(+), 102 deletions(-) diff --git a/Docs/Proxys.txt b/Docs/Proxys.txt index 62de774..7c08102 100644 --- a/Docs/Proxys.txt +++ b/Docs/Proxys.txt @@ -10,5 +10,7 @@ If no authentication is needed to use the proxy then the ':@ http A standard http proxy https An http proxy that uses encrypted connections ssltunnel An ssh server that supports connection forwarding + socks4 A socks4 proxy (openssh or tor using proxy) + socks5 A socks5 proxy All connections will then be forwarded through the proxy. diff --git a/Makefile b/Makefile index c7fb974..d14c90a 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -CC = cc +CC = gcc VERSION = 1.2.1 CFLAGS = -g -O2 LIBS = -lz -INSTALL=/usr/bin/install -c +INSTALL=/bin/install -c prefix=/usr/local bindir=$(prefix)${exec_prefix}/bin DESTDIR= diff --git a/config.log b/config.log index a453980..2c5d181 100644 --- a/config.log +++ b/config.log @@ -10,13 +10,13 @@ generated by GNU Autoconf 2.69. Invocation command line was ## Platform. ## ## --------- ## -hostname = freebsd -uname -m = i386 -uname -r = 10.3-RELEASE -uname -s = FreeBSD -uname -v = FreeBSD 10.3-RELEASE #0 r297264: Fri Mar 25 03:51:29 UTC 2016 root@releng1.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC +hostname = ferrara +uname -m = i686 +uname -r = 3.19.3amd +uname -s = Linux +uname -v = #1 Sat Apr 4 03:25:36 UTC 2015 -/usr/bin/uname -p = i386 +/usr/bin/uname -p = unknown /bin/uname -X = unknown /bin/arch = unknown @@ -27,14 +27,18 @@ uname -v = FreeBSD 10.3-RELEASE #0 r297264: Fri Mar 25 03:51:29 UTC 2016 roo /usr/bin/oslevel = unknown /bin/universe = unknown -PATH: /sbin -PATH: /bin -PATH: /usr/sbin -PATH: /usr/bin -PATH: /usr/games -PATH: /usr/local/sbin +PATH: /usr/prebin PATH: /usr/local/bin -PATH: /root/bin +PATH: /usr/bin +PATH: /usr/X11R7/bin +PATH: /bin +PATH: /usr/games/bin +PATH: /opt/Python-3.4.3/bin +PATH: /opt/tcl-8.6.3/bin +PATH: /opt/git-2.3.5/bin +PATH: /opt/wine-1.7.38/bin +PATH: /opt/perl-5.20.1/bin +PATH: /opt/curl-7.41.0/ ## ----------- ## @@ -42,74 +46,79 @@ PATH: /root/bin ## ----------- ## configure:1958: checking for gcc -configure:1988: result: no -configure:2051: checking for cc -configure:2072: found /usr/bin/cc -configure:2095: result: cc +configure:1974: found /usr/bin/gcc +configure:1985: result: gcc configure:2214: checking for C compiler version -configure:2223: cc --version >&5 -FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512 -Target: i386-unknown-freebsd10.3 -Thread model: posix +configure:2223: gcc --version >&5 +gcc (GCC) 4.9.2 +Copyright (C) 2014 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + configure:2234: $? = 0 -configure:2223: cc -v >&5 -FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512 -Target: i386-unknown-freebsd10.3 +configure:2223: gcc -v >&5 +Using built-in specs. +COLLECT_GCC=gcc +COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i486-pc-linux-gnu/4.9.2/lto-wrapper +Target: i486-pc-linux-gnu +Configured with: ../gcc-4.9.2-src/configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --localstatedir=/var --mandir=/usr/share/man --infodir=/usr/share/info --enable-languages=c,c++ --host=i486-pc-linux-gnu --build=i486-pc-linux-gnu --target=i486-pc-linux-gnu --enable-bootstrap Thread model: posix -Selected GCC installation: +gcc version 4.9.2 (GCC) configure:2234: $? = 0 -configure:2223: cc -V >&5 -cc: error: argument to '-V' is missing (expected 1 value) -cc: error: no input files +configure:2223: gcc -V >&5 +gcc: error: unrecognized command line option '-V' +gcc: fatal error: no input files +compilation terminated. configure:2234: $? = 1 -configure:2223: cc -qversion >&5 -cc: error: unknown argument: '-qversion' -cc: error: no input files +configure:2223: gcc -qversion >&5 +gcc: error: unrecognized command line option '-qversion' +gcc: fatal error: no input files +compilation terminated. configure:2234: $? = 1 configure:2254: checking whether the C compiler works -configure:2276: cc conftest.c >&5 +configure:2276: gcc conftest.c >&5 configure:2280: $? = 0 configure:2328: result: yes configure:2331: checking for C compiler default output file name configure:2333: result: a.out configure:2339: checking for suffix of executables -configure:2346: cc -o conftest conftest.c >&5 +configure:2346: gcc -o conftest conftest.c >&5 configure:2350: $? = 0 configure:2372: result: configure:2394: checking whether we are cross compiling -configure:2402: cc -o conftest conftest.c >&5 +configure:2402: gcc -o conftest conftest.c >&5 configure:2406: $? = 0 configure:2413: ./conftest configure:2417: $? = 0 configure:2432: result: no configure:2437: checking for suffix of object files -configure:2459: cc -c conftest.c >&5 +configure:2459: gcc -c conftest.c >&5 configure:2463: $? = 0 configure:2484: result: o configure:2488: checking whether we are using the GNU C compiler -configure:2507: cc -c conftest.c >&5 +configure:2507: gcc -c conftest.c >&5 configure:2507: $? = 0 configure:2516: result: yes -configure:2525: checking whether cc accepts -g -configure:2545: cc -c -g conftest.c >&5 +configure:2525: checking whether gcc accepts -g +configure:2545: gcc -c -g conftest.c >&5 configure:2545: $? = 0 configure:2586: result: yes -configure:2603: checking for cc option to accept ISO C89 -configure:2666: cc -c -g -O2 conftest.c >&5 +configure:2603: checking for gcc option to accept ISO C89 +configure:2666: gcc -c -g -O2 conftest.c >&5 configure:2666: $? = 0 configure:2679: result: none needed configure:2705: checking whether make sets $(MAKE) configure:2727: result: yes configure:2750: checking for a BSD-compatible install -configure:2818: result: /usr/bin/install -c +configure:2818: result: /bin/install -c configure:2835: checking how to run the C preprocessor -configure:2866: cc -E conftest.c +configure:2866: gcc -E conftest.c configure:2866: $? = 0 -configure:2880: cc -E conftest.c -conftest.c:9:10: fatal error: 'ac_nonexistent.h' file not found -#include - ^ -1 error generated. +configure:2880: gcc -E conftest.c +conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory + #include + ^ +compilation terminated. configure:2880: $? = 1 configure: failed program was: | /* confdefs.h */ @@ -121,14 +130,14 @@ configure: failed program was: | #define PACKAGE_URL "" | /* end confdefs.h. */ | #include -configure:2905: result: cc -E -configure:2925: cc -E conftest.c +configure:2905: result: gcc -E +configure:2925: gcc -E conftest.c configure:2925: $? = 0 -configure:2939: cc -E conftest.c -conftest.c:9:10: fatal error: 'ac_nonexistent.h' file not found -#include - ^ -1 error generated. +configure:2939: gcc -E conftest.c +conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory + #include + ^ +compilation terminated. configure:2939: $? = 1 configure: failed program was: | /* confdefs.h */ @@ -141,19 +150,19 @@ configure: failed program was: | /* end confdefs.h. */ | #include configure:2968: checking for grep that handles long lines and -e -configure:3026: result: /usr/bin/grep +configure:3026: result: /bin/grep configure:3031: checking for egrep -configure:3093: result: /usr/bin/grep -E +configure:3093: result: /bin/grep -E configure:3098: checking for ANSI C header files -configure:3118: cc -c -g -O2 conftest.c >&5 +configure:3118: gcc -c -g -O2 conftest.c >&5 configure:3118: $? = 0 -configure:3191: cc -o conftest -g -O2 conftest.c >&5 +configure:3191: gcc -o conftest -g -O2 conftest.c >&5 configure:3191: $? = 0 configure:3191: ./conftest configure:3191: $? = 0 configure:3202: result: yes configure:3211: checking for deflate in -lz -configure:3236: cc -o conftest -g -O2 conftest.c -lz >&5 +configure:3236: gcc -o conftest -g -O2 conftest.c -lz >&5 configure:3236: $? = 0 configure:3245: result: yes configure:3527: creating ./config.status @@ -171,10 +180,10 @@ generated by GNU Autoconf 2.69. Invocation command line was CONFIG_COMMANDS = $ ./config.status -on freebsd +on ferrara config.status:729: creating Makefile -configure:4604: === configuring in libUseful-2.4 (/root/Movgrab/libUseful-2.4) +configure:4604: === configuring in libUseful-2.4 (/home/meta/Movgrab/libUseful-2.4) configure:4667: running /bin/sh ./configure --disable-option-checking '--prefix=/usr/local' --cache-file=/dev/null --srcdir=. ## ---------------- ## @@ -182,33 +191,33 @@ configure:4667: running /bin/sh ./configure --disable-option-checking '--prefix= ## ---------------- ## ac_cv_c_compiler_gnu=yes -ac_cv_env_CC_set='' -ac_cv_env_CC_value='' -ac_cv_env_CFLAGS_set='' -ac_cv_env_CFLAGS_value='' -ac_cv_env_CPPFLAGS_set='' -ac_cv_env_CPPFLAGS_value='' -ac_cv_env_CPP_set='' -ac_cv_env_CPP_value='' -ac_cv_env_LDFLAGS_set='' -ac_cv_env_LDFLAGS_value='' -ac_cv_env_LIBS_set='' -ac_cv_env_LIBS_value='' -ac_cv_env_build_alias_set='' -ac_cv_env_build_alias_value='' -ac_cv_env_host_alias_set='' -ac_cv_env_host_alias_value='' -ac_cv_env_target_alias_set='' -ac_cv_env_target_alias_value='' +ac_cv_env_CC_set= +ac_cv_env_CC_value= +ac_cv_env_CFLAGS_set= +ac_cv_env_CFLAGS_value= +ac_cv_env_CPPFLAGS_set= +ac_cv_env_CPPFLAGS_value= +ac_cv_env_CPP_set= +ac_cv_env_CPP_value= +ac_cv_env_LDFLAGS_set= +ac_cv_env_LDFLAGS_value= +ac_cv_env_LIBS_set= +ac_cv_env_LIBS_value= +ac_cv_env_build_alias_set= +ac_cv_env_build_alias_value= +ac_cv_env_host_alias_set= +ac_cv_env_host_alias_value= +ac_cv_env_target_alias_set= +ac_cv_env_target_alias_value= ac_cv_header_stdc=yes ac_cv_lib_z_deflate=yes ac_cv_objext=o -ac_cv_path_EGREP='/usr/bin/grep -E' -ac_cv_path_GREP=/usr/bin/grep -ac_cv_path_install='/usr/bin/install -c' -ac_cv_prog_CC=cc -ac_cv_prog_CPP='cc -E' -ac_cv_prog_cc_c89='' +ac_cv_path_EGREP='/bin/grep -E' +ac_cv_path_GREP=/bin/grep +ac_cv_path_install='/bin/install -c' +ac_cv_prog_CPP='gcc -E' +ac_cv_prog_ac_ct_CC=gcc +ac_cv_prog_cc_c89= ac_cv_prog_cc_g=yes ac_cv_prog_make_make_set=yes @@ -216,17 +225,17 @@ ac_cv_prog_make_make_set=yes ## Output variables. ## ## ----------------- ## -CC='cc' +CC='gcc' CFLAGS='-g -O2' -CPP='cc -E' +CPP='gcc -E' CPPFLAGS='' DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64' ECHO_C='' ECHO_N='-n' ECHO_T='' -EGREP='/usr/bin/grep -E' +EGREP='/bin/grep -E' EXEEXT='' -GREP='/usr/bin/grep' +GREP='/bin/grep' INSTALL_DATA='${INSTALL} -m 644' INSTALL_PROGRAM='${INSTALL}' INSTALL_SCRIPT='${INSTALL}' @@ -245,7 +254,7 @@ PATH_SEPARATOR=':' SET_MAKE='' SHELL='/bin/sh' VERSION='1.2.1' -ac_ct_CC='' +ac_ct_CC='gcc' bindir='${exec_prefix}/bin' build_alias='' datadir='${datarootdir}' diff --git a/config.status b/config.status index 76057ee..cbbf808 100755 --- a/config.status +++ b/config.status @@ -427,9 +427,9 @@ Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/root/Movgrab' +ac_pwd='/home/meta/Movgrab' srcdir='.' -INSTALL='/usr/bin/install -c' +INSTALL='/bin/install -c' test -n "$AWK" || AWK=awk # The default lists apply if the user does not specify any file. ac_need_defaults=: @@ -584,20 +584,20 @@ echo 'BEGIN {' >"$ac_tmp/subs1.awk" && cat >>"$ac_tmp/subs1.awk" <<\_ACAWK && S["LTLIBOBJS"]="" S["LIBOBJS"]="" -S["EGREP"]="/usr/bin/grep -E" -S["GREP"]="/usr/bin/grep" -S["CPP"]="cc -E" +S["EGREP"]="/bin/grep -E" +S["GREP"]="/bin/grep" +S["CPP"]="gcc -E" S["INSTALL_DATA"]="${INSTALL} -m 644" S["INSTALL_SCRIPT"]="${INSTALL}" S["INSTALL_PROGRAM"]="${INSTALL}" S["SET_MAKE"]="" S["OBJEXT"]="o" S["EXEEXT"]="" -S["ac_ct_CC"]="" +S["ac_ct_CC"]="gcc" S["CPPFLAGS"]="" S["LDFLAGS"]="" S["CFLAGS"]="-g -O2" -S["CC"]="cc" +S["CC"]="gcc" S["subdirs"]=" libUseful-2.4" S["VERSION"]="1.2.1" S["target_alias"]="" diff --git a/libUseful-2.4/Makefile b/libUseful-2.4/Makefile index 44a82c8..f1da531 100644 --- a/libUseful-2.4/Makefile +++ b/libUseful-2.4/Makefile @@ -1,8 +1,8 @@ -CC = cc +CC = gcc VERSION = 0.0.1 CFLAGS = -g -O2 LIBS = -FLAGS=$(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -fPIC -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_OSS=1 -DHAVE_MADVISE -DHAVE_MADVISE_NOFORK -DHAVE_MADVISE_DONTDUMP -DHAVE_MLOCK +FLAGS=$(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -fPIC -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -D_FILE_OFFSET_BITS=64 -DHAVE_PTSNAME_R=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DUSE_SENDFILE=1 -DHAVE_OSS=1 -DHAVE_MADVISE -DHAVE_MADVISE_NOFORK -DHAVE_MADVISE_DONTDUMP -DHAVE_MLOCK prefix=/usr/local OBJ=string.o list.o socket.o unix_socket.o file.o tar.o ansi.o FileSystem.o GeneralFunctions.o DataProcessing.o EncryptedFiles.o ConnectManager.o sound.o pty.o Log.o http.o inet.o expect.o base64.o crc32.o md5c.o sha1.o sha2.o whirlpool.o jh_ref.o Hash.o Compression.o oauth.o libsettings.o Vars.o MathExpr.o Time.o Markup.o SpawnPrograms.o Tokenizer.o PatternMatch.o ParseURL.o ConnectionChain.o openssl.o proctitle.o securemem.o diff --git a/main.c b/main.c index 1c78174..2ba5ffa 100644 --- a/main.c +++ b/main.c @@ -258,7 +258,7 @@ fprintf(stdout,"'-a' Authentication info in Username:Password format.\n"); fprintf(stdout,"'-q' QUIET. No progress/informative output.\n"); fprintf(stdout,"'-b' Background. Fork into background and nohup\n"); fprintf(stdout,"'-p' address of http/https/sstunnel proxy server in URL format.\n"); -fprintf(stdout,"'-proxy' address of http/https/sstunnel proxy server in URL format.\n"); +fprintf(stdout,"'-proxy' address of http/https/socks4/socks5/sstunnel proxy server in URL format.\n"); fprintf(stdout,"'-w' Wait for addresses to be entered on stdin.\n"); fprintf(stdout,"'-st' Connection inactivity timeout in seconds. Set high for sites that 'throttle'\n"); fprintf(stdout,"'-tw ' Set max width of item title in progress display (Default 50 chars)\n"); @@ -286,6 +286,8 @@ fprintf(stdout,"The url should be that of the page that the movie would normally fprintf(stdout,"\nDownload types are:\n"); for (i=1; DownloadTypes[i] !=NULL; i++) fprintf(stdout,"%-20s %s\n",DownloadTypes[i],DownloadNames[i]); +fprintf(stdout,"\nThe -proxy argument has the form ::@:. So, for example socks4:192.168.1.1:8080 or socks5:user1:secret@192.168.1.1:5050\n"); + fprintf(stdout,"\nIf a website is not in the list, try 'movgrab -t generic '\n"); fprintf(stdout,"\nMovgrab can also be used to stream from internet radio and pipe it into a player. E.g.'\n movgrab -o - -q -proxy ssltunnel://guest:s3cr3t@sshserver:1022 http://schizoid.in/schizoid-psy.pls | mpg123 -\n"); fprintf(stdout,"\nFeel free to email me and tell me if you've used this software!\n");