upgrade to libUseful-2.6. Socks proxy works now for proxys that don't…

… expect username/password

Makefile

@@ -1,20 +1,20 @@
 CC = gcc
 VERSION = 1.2.1
 CFLAGS = -g -O2
-LIBS = -lz 
+LIBS = -lcrypto -lssl -lz 
 INSTALL=/bin/install -c
 prefix=/usr/local
 bindir=$(prefix)${exec_prefix}/bin
 DESTDIR=
-FLAGS=$(CFLAGS) -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 
+FLAGS=$(CFLAGS) -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 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1 
 OBJ=containerfiles.o outputfiles.o common.o ehow.o  youtube.o servicetypes.o extract_text.o download.o display.o
 
 all: $(OBJ)
-	@cd libUseful-2.4; $(MAKE)
-	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful-2.4/libUseful-2.4.a
+	@cd libUseful-2.6; $(MAKE)
+	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful-2.6/libUseful-2.6.a
 
 clean:
-	@rm -f movgrab *.o libUseful-2.4/*.o libUseful-2.4/*.a libUseful-2.4/*.so
+	@rm -f movgrab *.o libUseful-2.6/*.o libUseful-2.6/*.a libUseful-2.6/*.so
 
 containerfiles.o: containerfiles.c containerfiles.h
 	$(CC) $(FLAGS) -c containerfiles.c

Makefile.in

@@ -10,11 +10,11 @@ FLAGS=$(CFLAGS) @DEFS@
 OBJ=containerfiles.o outputfiles.o common.o ehow.o  youtube.o servicetypes.o extract_text.o download.o display.o
 
 all: $(OBJ)
-	@cd libUseful-2.4; $(MAKE)
-	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful-2.4/libUseful-2.4.a
+	@cd libUseful-2.6; $(MAKE)
+	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful-2.6/libUseful-2.6.a
 
 clean:
-	@rm -f movgrab *.o libUseful-2.4/*.o libUseful-2.4/*.a libUseful-2.4/*.so
+	@rm -f movgrab *.o libUseful-2.6/*.o libUseful-2.6/*.a libUseful-2.6/*.so
 
 containerfiles.o: containerfiles.c containerfiles.h
 	$(CC) $(FLAGS) -c containerfiles.c

autom4te.cache/output.0

@@ -655,7 +655,7 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP'
-ac_subdirs_all='libUseful-2.4'
+ac_subdirs_all='libUseful-2.6'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -1904,7 +1904,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-subdirs="$subdirs libUseful-2.4"
+subdirs="$subdirs libUseful-2.6"
 
 
 ac_ext=c

autom4te.cache/requests

@@ -14,63 +14,63 @@
                         'configure.in'
                       ],
                       {
-                        'AM_PROG_F77_C_O' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_INIT' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
                         'm4_sinclude' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_NLS' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_INIT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_FC_PP_DEFINE' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        '_m4_warn' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
                         '_AM_COND_ENDIF' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'LT_INIT' => 1,
-                        'include' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_PROG_AR' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        '_m4_warn' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_PROG_FC_C_O' => 1,
+                        'AM_NLS' => 1,
                         'AC_FC_FREEFORM' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
                         'AC_FC_PP_SRCEXT' => 1,
-                        'AH_OUTPUT' => 1,
+                        'AC_CONFIG_FILES' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_CC_C_O' => 1,
                         'sinclude' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AC_INIT' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'include' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_PROG_AR' => 1,
                         'AC_CONFIG_HEADERS' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_POT_TOOLS' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'm4_include' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AC_SUBST_TRACE' => 1
+                        'AC_SUBST' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AH_OUTPUT' => 1,
+                        'm4_pattern_allow' => 1
                       }
                     ], 'Autom4te::Request' )
            );

autom4te.cache/traces.0

@@ -149,8 +149,8 @@ m4trace:configure.in:3: -1- m4_pattern_allow([^target_alias$])
 m4trace:configure.in:6: -1- AC_SUBST([VERSION])
 m4trace:configure.in:6: -1- AC_SUBST_TRACE([VERSION])
 m4trace:configure.in:6: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.in:8: -1- AC_CONFIG_SUBDIRS([libUseful-2.4])
-m4trace:configure.in:8: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([libUseful-2.4])"])
+m4trace:configure.in:8: -1- AC_CONFIG_SUBDIRS([libUseful-2.6])
+m4trace:configure.in:8: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([libUseful-2.6])"])
 m4trace:configure.in:8: -1- AC_SUBST_TRACE([subdirs])
 m4trace:configure.in:8: -1- m4_pattern_allow([^subdirs$])
 m4trace:configure.in:10: -1- AC_SUBST([CC])

common.h

@@ -4,7 +4,7 @@
 //This is doable through autoconf, but I'm sick of fighting with it
 #define Version "2.0.0"
 
-#include "libUseful-2.4/libUseful.h"
+#include "libUseful-2.6/libUseful.h"
 #include <string.h>
 #include <glob.h>
 #include "extract_text.h"

config.log

@@ -4,17 +4,17 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure 
+  $ ./configure --enable-ssl
 
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
-hostname = ferrara
-uname -m = i686
-uname -r = 3.19.3amd
+hostname = colums-hp
+uname -m = x86_64
+uname -r = 4.7.4-64
 uname -s = Linux
-uname -v = #1 Sat Apr 4 03:25:36 UTC 2015
+uname -v = #1 SMP Fri Sep 16 22:00:54 UTC 2016
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -33,12 +33,24 @@ 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: .
+PATH: /opt/Csound-6.05/bin
+PATH: /opt/Qt4/bin
+PATH: /opt/SDL/bin
+PATH: /opt/SDL2/bin
+PATH: /opt/chkrootkit-0.50/bin
+PATH: /opt/ghostscript-9.19/bin
+PATH: /opt/git-2.9.3/bin
+PATH: /opt/jx9-1.0/bin
+PATH: /opt/lua-5.3.3/bin
+PATH: /opt/lxc-2.0.3/bin
+PATH: /opt/mujs-b005928/bin
 PATH: /opt/perl-5.20.1/bin
-PATH: /opt/curl-7.41.0/
+PATH: /opt/poppler-0.43.0/bin
+PATH: /opt/qemu-2.5.0/bin
+PATH: /opt/schily/bin
+PATH: /opt/wine-1.9.18/bin
+PATH: /opt/x86_64/bin
 
 
 ## ----------- ##
@@ -50,20 +62,20 @@ configure:1974: found /usr/bin/gcc
 configure:1985: result: gcc
 configure:2214: checking for C compiler version
 configure:2223: gcc --version >&5
-gcc (GCC) 4.9.2
-Copyright (C) 2014 Free Software Foundation, Inc.
+gcc (GCC) 5.3.0
+Copyright (C) 2015 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: 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
+COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i486-pc-linux-gnu/5.3.0/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
+Configured with: ../gcc-5.3.0-src/configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --localstatedir=/var --mandir=/usr/share/man --infodir=/usr/share/info --enable-languages=c,c++,go --host=i486-pc-linux-gnu --build=i486-pc-linux-gnu --target=i486-pc-linux-gnu --enable-bootstrap
 Thread model: posix
-gcc version 4.9.2 (GCC) 
+gcc version 5.3.0 (GCC) 
 configure:2234: $? = 0
 configure:2223: gcc -V >&5
 gcc: error: unrecognized command line option '-V'
@@ -116,8 +128,6 @@ configure:2866: gcc -E  conftest.c
 configure:2866: $? = 0
 configure:2880: gcc -E  conftest.c
 conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
- #include <ac_nonexistent.h>
-                            ^
 compilation terminated.
 configure:2880: $? = 1
 configure: failed program was:
@@ -135,8 +145,6 @@ configure:2925: gcc -E  conftest.c
 configure:2925: $? = 0
 configure:2939: gcc -E  conftest.c
 conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
- #include <ac_nonexistent.h>
-                            ^
 compilation terminated.
 configure:2939: $? = 1
 configure: failed program was:
@@ -165,6 +173,14 @@ configure:3211: checking for deflate in -lz
 configure:3236: gcc -o conftest -g -O2   conftest.c -lz   >&5
 configure:3236: $? = 0
 configure:3245: result: yes
+configure:3279: checking for SSL_library_init in -lssl
+configure:3304: gcc -o conftest -g -O2   conftest.c -lssl  -lz  >&5
+configure:3304: $? = 0
+configure:3313: result: yes
+configure:3326: checking for EVP_CIPHER_CTX_init in -lcrypto
+configure:3351: gcc -o conftest -g -O2   conftest.c -lcrypto  -lssl -lz  >&5
+configure:3351: $? = 0
+configure:3360: result: yes
 configure:3527: creating ./config.status
 
 ## ---------------------- ##
@@ -180,11 +196,11 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on ferrara
+on colums-hp
 
 config.status:729: creating Makefile
-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=.
+configure:4604: === configuring in libUseful-2.6 (/mnt/Movgrab-2.0.0/libUseful-2.6)
+configure:4667: running /bin/sh ./configure --disable-option-checking '--prefix=/usr/local'  '--enable-ssl' --cache-file=/dev/null --srcdir=.
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -210,6 +226,8 @@ 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_crypto_EVP_CIPHER_CTX_init=yes
+ac_cv_lib_ssl_SSL_library_init=yes
 ac_cv_lib_z_deflate=yes
 ac_cv_objext=o
 ac_cv_path_EGREP='/bin/grep -E'
@@ -229,7 +247,7 @@ CC='gcc'
 CFLAGS='-g -O2'
 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'
+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 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1'
 ECHO_C=''
 ECHO_N='-n'
 ECHO_T=''
@@ -241,7 +259,7 @@ INSTALL_PROGRAM='${INSTALL}'
 INSTALL_SCRIPT='${INSTALL}'
 LDFLAGS=''
 LIBOBJS=''
-LIBS='-lz '
+LIBS='-lcrypto -lssl -lz '
 LTLIBOBJS=''
 OBJEXT='o'
 PACKAGE_BUGREPORT=''
@@ -278,7 +296,7 @@ program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
 sharedstatedir='${prefix}/com'
-subdirs=' libUseful-2.4'
+subdirs=' libUseful-2.6'
 sysconfdir='${prefix}/etc'
 target_alias=''
 
@@ -297,5 +315,7 @@ target_alias=''
 #define HAVE_LIBZ 1
 #define _LARGEFILE64_SOURCE 1
 #define _FILE_OFFSET_BITS 64
+#define HAVE_LIBSSL 1
+#define HAVE_LIBCRYPTO 1
 
 configure: exit 0