Compilation with static OpenSSL3

README.md

@@ -46,14 +46,12 @@ _internals_:
 For utils:
 
   * libcurl
-  * openssl
+  * OpenSSL
   * libzip
   * libpugixml
 
 
-External & utils dependencies has to be installed by your package manager (_apt_ for example).
-Use _-dev_ flavours to get needed headers.
-Internal libraries are automatically fetched and statically compiled during the first compilation.
+Internal libraries are automatically fetched and statically compiled during the first run.
 When you update libgourou's repository, **don't forget to update internal libraries** with:
 
     make update_lib
@@ -166,4 +164,3 @@ Donators
   * _Berwyn H_
   * _bwitt_
   * _Ismail_
-  * _Radon_

include/libgourou.h

@@ -37,7 +37,7 @@
 #define ACS_SERVER              "http://adeactivate.adobe.com/adept"
 #endif
 
-#define LIBGOUROU_VERSION       "0.8.7"
+#define LIBGOUROU_VERSION       "0.8.6"
 
 namespace gourou
 {

scripts/setup.sh

@@ -2,8 +2,17 @@
 
 # uPDFParser
 if [ ! -d lib/updfparser ] ; then
-    git clone git://soutade.fr/soutade/updfparser.git lib/updfparser
+    git clone git://soutade.fr/updfparser.git lib/updfparser
     pushd lib/updfparser
     make BUILD_STATIC=1 BUILD_SHARED=0
     popd
 fi
+
+# OpenSSL legacy
+if [ ! -d lib/openssl ] ; then
+    git clone --branch openssl-3.3 https://github.com/openssl/openssl.git lib/openssl
+    pushd lib/openssl
+    ./Configure disable-apps disable-shared enable-legacy
+    make -j4
+    popd
+fi

src/libgourou.cpp

@@ -859,12 +859,6 @@ namespace gourou
     std::string DRMProcessor::getDefaultAdeptDir(void)
     {
 #ifndef DEFAULT_ADEPT_DIR
-    const char* home = getenv("HOME");
-    
-    if (home)
-        return home + std::string("/.config/adept/");
-    else
-    {
 	const char* user = getenv("USER");
 	
 	if (user && user[0])
@@ -873,7 +867,6 @@ namespace gourou
 	}
 	else
 	    return LOCAL_ADEPT_DIR;
-    }
 #else
 	return DEFAULT_ADEPT_DIR "/";
 #endif

utils/Makefile

@@ -10,6 +10,7 @@ CXXFLAGS=-Wall -fPIC -I$(ROOT)/include
 
 STATIC_DEP=
 LDFLAGS += -L$(ROOT) -lcrypto -lzip -lz -lcurl -lpugixml
+LDFLAGS += -L$(ROOT) $(ROOT)/lib/openssl/libcrypto.a -lzip -lz -lcurl -lpugixml
 
 ifneq ($(STATIC_UTILS),)
 STATIC_DEP = $(ROOT)/libgourou.a