From 7dc67ddba6246b1e16fb354e4aeaab3693727ec9 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sat, 13 Feb 2021 20:37:50 +0100 Subject: [PATCH 1/2] MIT license pin adobekey.py to python2 version --- LICENSE.txt | 19 +++++++++++++++++++ newid | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..9ffc426 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,19 @@ +Copyright (c) 2021 Tim Schumacher + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/newid b/newid index fe3100f..5053dfa 100755 --- a/newid +++ b/newid @@ -13,7 +13,7 @@ fi wget -P container --no-clobber \ http://download.adobe.com/pub/adobe/digitaleditions/ADE_2.0_Installer.exe \ http://www.voidspace.org.uk/python/pycrypto-2.6.1/pycrypto-2.6.1.win32-py2.6.exe \ - https://raw.githubusercontent.com/apprenticeharper/DeDRM_tools/master/DeDRM_plugin/adobekey.py \ + https://raw.githubusercontent.com/apprenticeharper/DeDRM_tools/92bf51bc8f201a2d5b1e8b90b8dc033606dbcfb0/DeDRM_plugin/adobekey.py \ || exit 1 docker build --tag adobe_diged_docker . From 79d6bbfd43846407e7c7f828dfaf900111e96b09 Mon Sep 17 00:00:00 2001 From: John McAvoy Date: Mon, 3 Jan 2022 20:17:48 -0500 Subject: [PATCH 2/2] Change Debian Version from 10 to 11 As mentioned in the README, wine on Debian 10 (buster) will not complete the installation of ADE. However, it works on Debian 11 (bullseye). Changing the Docker base image to bullseye fixes this issue. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 56a7c6c..8584ea2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:bullseye RUN sed -i 's/ main/ main contrib non-free/' /etc/apt/sources.list RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y \