-
Notifications
You must be signed in to change notification settings - Fork 12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Reorganizes mimetype declarations for template consolidation #198
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b6cf665
Consolidates mimetypes for sd-proxy
3f88779
Consolidates mimetypes for svs-disp pkg
849661f
Creates sd-viewer metapackage, replaces sd-svs-disp
330c499
Moves sd-proxy config to private volume
284c251
Removes mimetypes from securedrop-export
d0aa3a6
Place default mimeapps.list in securedrop-workstation-config package
emkll 6669226
Cleans up "default" option for mimetypes in config pkg
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| files/application-x-sd-export.xml usr/share/mime/packages | ||
| files/send-to-usb.desktop usr/share/applications | ||
| files/sd-logo.png usr/share/securedrop/icons | ||
| files/mimeapps.list usr/share/applications/ | ||
| files/open-in-dvm.desktop usr/share/applications/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| securedrop-workstation-config (0.1.5+buster) unstable; urgency=medium | ||
|
|
||
| * Adds a "default" mimetype handler, for reuse by other VMs | ||
|
|
||
| -- SecureDrop Team <[email protected]> Thu, 01 Oct 2020 17:55:53 -0700 | ||
|
|
||
| securedrop-workstation-config (0.1.4+buster) unstable; urgency=medium | ||
|
|
||
| * Provides mime type files all VMs for template consolidation | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,10 @@ | ||
| securedrop-workstation-svs-disp (0.2.3+buster) unstable; urgency=medium | ||
|
|
||
| * Removes mimetype handling logic, now handled in the | ||
| 'securedrop-workstation-config' package. | ||
|
|
||
| -- SecureDrop Team <[email protected]> Fri, 11 Sep 2020 11:03:11 -0700 | ||
|
|
||
| securedrop-workstation-svs-disp (0.2.2+buster) unstable; urgency=medium | ||
|
|
||
| * Fix mime type handling for desktop files | ||
|
|
||
1 change: 0 additions & 1 deletion
1
securedrop-workstation-svs-disp/debian/securedrop-workstation-svs-disp.install
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| mimeapps.list usr/share/applications/ | ||
| paxctld.conf.svsdisp opt/ | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| securedrop-workstation-viewer (0.1.1+buster) unstable; urgency=medium | ||
|
|
||
| * Fixes typo in control fields, replaces package | ||
| 'securedrop-workstation-svs-disp' | ||
|
|
||
| -- SecureDrop Team <[email protected]> Mon, 05 Oct 2020 16:59:56 -0700 | ||
|
|
||
| securedrop-workstation-viewer (0.1.0+buster) unstable; urgency=medium | ||
|
|
||
| * Creates package, replacing 'securedrop-workstation-sd-svs-disp' package | ||
|
|
||
| -- SecureDrop Team <[email protected]> Thu, 01 Oct 2020 17:36:58 -0700 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| Source: securedrop-workstation-viewer | ||
| Section: unknown | ||
| Priority: optional | ||
| Maintainer: SecureDrop Team <[email protected]> | ||
| Build-Depends: debhelper (>= 9), | ||
| Standards-Version: 3.9.8 | ||
| Homepage: https://github.com/freedomofpress/securedrop-debian-packaging | ||
|
|
||
| Package: securedrop-workstation-viewer | ||
| Architecture: all | ||
| Depends: securedrop-workstation-config,securedrop-workstation-grsec,apparmor-profiles,apparmor-profiles-extra,apparmor-utils,audacious,eog,evince,file-roller,gedit,totem | ||
| Description: This is the SecureDrop workstation SecureDrop Viewer Disposable VM template configuration package. This package provides dependencies and configuration for the Qubes SecureDrop workstation sd-viewer Template VM. | ||
| Provides: securedrop-workstation-svs-disp | ||
| Conflicts: securedrop-workstation-svs-disp | ||
| Replaces: securedrop-workstation-svs-disp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | ||
| Upstream-Name: securedrop-workstation-svs-disp | ||
| Source: https://github.com/freedomofpress/securedrop-debian-packaging | ||
|
|
||
| Files: * | ||
| Copyright: 2020 Freedom of the Press Foundation <[email protected]> | ||
| License: GPLv3+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #!/usr/bin/make -f | ||
|
|
||
| %: | ||
| dh $@ |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the pax flags are also handled by the config package[1] , we can also remove this and relevant postinst chances
Given that this package will not be installed in consolidated template, we don't strictly need to add this here, we can just remove all the
workstation-svs-disprelated stuff after we release consolidated templates.[1] https://github.com/freedomofpress/securedrop-debian-packaging/pull/190/files
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, that was my plan: we'll circle back and delete all these packages once the release has shipped. I don't see a pressing need to do that right now.