Compare commits

..

3 Commits

5 changed files with 7 additions and 6 deletions

View File

@@ -54,7 +54,7 @@ $(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT)
libgourou: libgourou.a libgourou.so libgourou: libgourou.a libgourou.so
libgourou.a: $(OBJECTS) libgourou.a: $(OBJECTS)
$(AR) crs $@ obj/*.o $(LDFLAGS) $(AR) crs $@ obj/*.o ./lib/updfparser/obj/*.o
libgourou.so: $(OBJECTS) $(UPDFPARSERLIB) libgourou.so: $(OBJECTS) $(UPDFPARSERLIB)
$(CXX) obj/*.o $(LDFLAGS) -o $@ -shared $(CXX) obj/*.o $(LDFLAGS) -o $@ -shared

View File

@@ -27,19 +27,19 @@ Utils
You can import configuration from your eReader or create a new one with utils/activate : You can import configuration from your eReader or create a new one with utils/activate :
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD
./utils/activate -u <AdobeID USERNAME> ./activate -u <AdobeID USERNAME>
Then a _./.adept_ directory is created with all configuration file Then a _./.adept_ directory is created with all configuration file
To download an ePub/PDF : To download an ePub/PDF :
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD
./utils/acsmdownloader -f <ACSM_FILE> ./acsmdownloader -f <ACSM_FILE>
To export your private key : To export your private key :
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD
./utils/acsmdownloader --export-private-key [-o adobekey_1.der] ./acsmdownloader --export-private-key [-o adobekey_1.der]
Sources Sources

View File

@@ -40,7 +40,7 @@
#define ACS_SERVER "http://adeactivate.adobe.com/adept" #define ACS_SERVER "http://adeactivate.adobe.com/adept"
#endif #endif
#define LIBGOUROU_VERSION "0.4.1" #define LIBGOUROU_VERSION "0.4.2"
namespace gourou namespace gourou
{ {

View File

@@ -2,6 +2,7 @@
TARGETS=acsmdownloader adept_activate TARGETS=acsmdownloader adept_activate
CXXFLAGS=-Wall `pkg-config --cflags Qt5Core Qt5Network` -fPIC -I$(ROOT)/include -I$(ROOT)/lib/pugixml/src/ CXXFLAGS=-Wall `pkg-config --cflags Qt5Core Qt5Network` -fPIC -I$(ROOT)/include -I$(ROOT)/lib/pugixml/src/
LDFLAGS=`pkg-config --libs Qt5Core Qt5Network` -L$(ROOT) -lcrypto -lzip -lz LDFLAGS=`pkg-config --libs Qt5Core Qt5Network` -L$(ROOT) -lcrypto -lzip -lz
ifneq ($(STATIC_UTILS),) ifneq ($(STATIC_UTILS),)
LDFLAGS += $(ROOT)/libgourou.a LDFLAGS += $(ROOT)/libgourou.a

View File

@@ -116,7 +116,7 @@ std::string DRMProcessorClientImpl::sendHTTPRequest(const std::string& URL, cons
if (location.size() != 0) if (location.size() != 0)
{ {
GOUROU_LOG(gourou::DEBUG, "New location"); GOUROU_LOG(gourou::DEBUG, "New location");
return sendHTTPRequest(location.constData(), POSTData, contentType); return sendHTTPRequest(location.constData(), POSTData, contentType, responseHeaders);
} }
if (reply->error() != QNetworkReply::NoError) if (reply->error() != QNetworkReply::NoError)