diff --git a/LICENSE b/LICENSE index 2d5385c..0038364 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ MIT License +Copyright (c) 2022-2023 Freedom of the Press Foundation Copyright (c) 2020-2021 First Look Media Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/README.md b/README.md index 0ed33f4..98bd923 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Take potentially dangerous PDFs, office documents, or images and convert them to Dangerzone works like this: You give it a document that you don't know if you can trust (for example, an email attachment). Inside of a sandbox, Dangerzone converts the document to a PDF (if it isn't already one), and then converts the PDF into raw pixel data: a huge list of RGB color values for each page. Then, in a separate sandbox, Dangerzone takes this pixel data and converts it back into a PDF. -_Read more about Dangerzone in the blog post [Dangerzone: Working With Suspicious Documents Without Getting Hacked](https://tech.firstlook.media/dangerzone-working-with-suspicious-documents-without-getting-hacked)._ +_Read more about Dangerzone in the [official site](https://dangerzone.rocks/about.html)._ ## Getting started diff --git a/install/linux/media.firstlook.dangerzone.desktop b/install/linux/press.freedom.dangerzone.desktop similarity index 96% rename from install/linux/media.firstlook.dangerzone.desktop rename to install/linux/press.freedom.dangerzone.desktop index 3aa250b..18eafb0 100644 --- a/install/linux/media.firstlook.dangerzone.desktop +++ b/install/linux/press.freedom.dangerzone.desktop @@ -5,6 +5,6 @@ Comment=Take potentially dangerous PDFs, office documents, or images and convert Exec=dangerzone %u Terminal=false Type=Application -Icon=media.firstlook.dangerzone +Icon=press.freedom.dangerzone Categories=Office;Utility;OCR;Security MimeType=application/pdf;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/msword;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.spreadsheet;image/jpeg;image/gif;image/png;image/tiff;image/x-tiff \ No newline at end of file diff --git a/install/linux/media.firstlook.dangerzone.png b/install/linux/press.freedom.dangerzone.png similarity index 100% rename from install/linux/media.firstlook.dangerzone.png rename to install/linux/press.freedom.dangerzone.png diff --git a/install/macos/build-app.py b/install/macos/build-app.py index e13511d..839a753 100755 --- a/install/macos/build-app.py +++ b/install/macos/build-app.py @@ -74,7 +74,9 @@ def main(): if args.with_codesign: print("○ Code signing app bundle") identity_name_application = ( - "Developer ID Application: FIRST LOOK PRODUCTIONS, INC. (P24U45L8P5)" + # FIXME: Update this line with the proper developer ID, once we know what + # that is. + "Developer ID Application: FREEDOM OF THE PRESS FOUNDATION, 501(c)(3)" ) entitlements_plist_path = os.path.join(root, "install/macos/entitlements.plist") diff --git a/install/pyinstaller/pyinstaller.spec b/install/pyinstaller/pyinstaller.spec index 0207c32..f8d2380 100644 --- a/install/pyinstaller/pyinstaller.spec +++ b/install/pyinstaller/pyinstaller.spec @@ -64,7 +64,7 @@ if p == "Darwin": coll, name="Dangerzone.app", icon="../macos/dangerzone.icns", - bundle_identifier="media.firstlook.dangerzone", + bundle_identifier="press.freedom.dangerzone", info_plist={ "NSHighResolutionCapable": True, "CFBundleShortVersionString": version, diff --git a/install/windows/build-wxs.py b/install/windows/build-wxs.py index 5c70e78..a926afb 100644 --- a/install/windows/build-wxs.py +++ b/install/windows/build-wxs.py @@ -82,7 +82,7 @@ def build_dir_xml(root, data): component_el, "RegistryValue", Root="HKCU", - Key="Software\First Look Media\Dangerzone", + Key="Software\Freedom of the Press Foundation\Dangerzone", Name="installed", Type="integer", Value="1", @@ -161,7 +161,7 @@ def main(): root_el, "Product", Name="Dangerzone", - Manufacturer="First Look Media", + Manufacturer="Freedom of the Press Foundation", Id="*", UpgradeCode="$(var.ProductUpgradeCode)", Language="1033", @@ -174,7 +174,7 @@ def main(): Id="*", Keywords="Installer", Description="Dangerzone $(var.ProductVersion) Installer", - Manufacturer="First Look Media", + Manufacturer="Freedom of the Press Foundation", InstallerVersion="100", Languages="1033", Compressed="yes", @@ -195,7 +195,7 @@ def main(): product_el, "Property", Id="ARPURLINFOABOUT", - Value="https://tech.firstlook.media", + Value="https://freedom.press", ) ET.SubElement(product_el, "UIRef", Id="WixUI_Minimal") ET.SubElement(product_el, "UIRef", Id="WixUI_ErrorProgressText") diff --git a/install/windows/license.rtf b/install/windows/license.rtf index f31674a..11ef9b7 100755 Binary files a/install/windows/license.rtf and b/install/windows/license.rtf differ diff --git a/pyproject.toml b/pyproject.toml index 77bcd94..ddb94ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "dangerzone" version = "0.4.0" description = "Take potentially dangerous PDFs, office documents, or images and convert them to safe PDFs" -authors = ["Micah Lee "] +authors = ["Freedom of the Press Foundation ", "Micah Lee "] license = "MIT" [tool.poetry.dependencies] diff --git a/setup.py b/setup.py index 602c17c..33f5e07 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ def file_list(path): setuptools.setup( name="dangerzone", version=version, - author="Micah Lee", - author_email="micah.lee@theintercept.com", + author="Freedom of the Press Foundation", + author_email="info@freedom.press", license="MIT", description="Take potentially dangerous PDFs, office documents, or images and convert them to safe PDFs", long_description="""\ @@ -33,11 +33,11 @@ It uses container technology to convert the documents within a secure sandbox.\ data_files=[ ( "share/applications", - ["install/linux/media.firstlook.dangerzone.desktop"], + ["install/linux/press.freedom.dangerzone.desktop"], ), ( "share/icons/hicolor/64x64/apps", - ["install/linux/media.firstlook.dangerzone.png"], + ["install/linux/press.freedom.dangerzone.png"], ), ("share/dangerzone", file_list("share")), ], diff --git a/stdeb.cfg b/stdeb.cfg index c778f29..8c41c2c 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -8,3 +8,4 @@ X-Python3-Version: >= 3.6 # has tested the package already. For more info, see: # https://github.com/freedomofpress/dangerzone/issues/292#issuecomment-1349967888 Setup-Env-Vars: DEB_BUILD_OPTIONS=nocheck +Maintainer: Freedom of the Press Foundation