[gocryptfs] Add gocryptfs package (build without openssl) #318

plan5 · 2021-03-22T21:46:38Z

No description provided.

package/gocryptfs/package

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>

package/gocryptfs/package

matteodelabre · 2021-03-23T13:44:24Z

I would suggest using the recently added golang:v1.5 toolchain image and removing the build:golang dependency to speed up the build process.

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>

…sting

plan5 · 2021-03-23T16:41:44Z

I would suggest using the recently added golang:v1.5 toolchain image and removing the build:golang dependency to speed up the build process.

Ok, good to know that's there. I've update the PR (hope I'm doing this right...).

Btw. should I rather try to merge a branch or should I merge directly into testing as I did now?

…sting

plan5 · 2021-03-23T16:46:10Z

I've now also put all $_srcver in quotes to comply with the style guide.

package/gocryptfs/package

Eeems · 2021-03-23T17:15:56Z

@plan5 what would be the best way to test this?

plan5 · 2021-03-23T19:08:45Z

@plan5 what would be the best way to test this?

Are you asking for a manual or an automatized solution?
Can you send me an example test for another package if for automized testing?

For manual testing:
To test the binary, you can just run it and see if it displays the help message.

To test functionality you can set up any directory to be encrypted. e.g.

mkdir /tmp/cipher /tmp/plain
echo "testpass"|gocryptfs -init /tmp/cipher
echo "testpass"|gocryptfs /tmp/cipher /tmp/plain
echo "content" > /tmp/plain/secretfile
fusermount -u /tmp/plain

/tmp/plain should now be empty and /tmp/cipher should contain an encrypted file.

echo "testpass"|gocryptfs /tmp/cipher /tmp/plain
cat /tmp/plain/secretfile

This should output "content".

Eeems · 2021-03-23T19:28:16Z

Are you asking for a manual or an automatized solution?

Manual testing.

Thanks, I'll try to take a look later today

Eeems · 2021-03-23T19:37:19Z

Looks like we are missing something? (Testing on a rM1)

plan5 · 2021-03-23T19:46:43Z

Looks like we are missing something? (Testing on a rM1)

The gocryptfs -init command only takes one argument (the to be encrypted dir):
gocryptfs -init /tmp/cipher

plan5 · 2021-03-23T19:48:10Z

But also fuse isn't working, hmm. I'll have to check on rM2 later.

Eeems · 2021-03-23T19:48:47Z

But also fuse isn't working, hmm. I'll have to check on rM2 later.

Looks like the module isn't included on the rM1. We may need to package that as well. See the wireguard package for information on howw to do that.

plan5 · 2021-03-23T19:50:52Z

Ok I'll have a look at it

plan5 · 2021-04-20T13:58:54Z

I've just locally merged fuse and then gocryptfs into testing and noticed that #318 conflicts with #331 because I've deleted an accidental copy of the gocryptfs recipe that ended up in the fuse branch. ("CONFLICT (modify/delete): package/gocryptfs/package deleted in HEAD and modified in gocryptfs.").

Should I just leave it at that and you will fix it when the merge happens or can I do something to smooth it out?

Eeems · 2021-04-20T14:00:51Z

We'll have to resolve the merge conflict after one of them gets merged into testing.

Eeems

Works for me with the latest build of fuse on my rM1. It's probably best to merge this after that PR though.

…sting

Eeems · 2021-04-24T16:32:46Z

@plan5 you seem to have removed all changes to this PR?

plan5 · 2021-04-24T21:48:45Z

@plan5 you seem to have removed all changes to this PR?

Oof, I just clicked the button to bring the branch up to date with testing. I thought this would omit the changes to the branch. I'll check out what happened tomorrow and revert it m)

…into testing" This reverts commit 324dc3a, reversing changes made to 127565d.

This reverts commit 127565d.

plan5 · 2021-04-25T17:18:28Z

@plan5 you seem to have removed all changes to this PR?

Ok I think it's fixed. It was a mixup because I kept the gocryptfs package in my local testing instead of its own branch. Once it's all merged I'll re-fork and keep things tidy ( I hope ;) )

Eeems · 2021-04-25T21:57:17Z

Looks like you accidentally undid changes on the testing branch.

plan5 · 2021-04-26T06:34:17Z

Looks like you accidentally undid changes on the testing branch.

Ah yes that makes sense, with the revert.

I've merged the official testing branch again. I hope it's fixed now.

Eeems · 2021-04-26T13:16:18Z

It is not, using a revert commit will not allow merges to fix the issue. You'll have to go in and manually revert the changes or do some history rewriting to fix it up.

plan5 · 2021-04-26T16:24:48Z

It is not, using a revert commit will not allow merges to fix the issue. You'll have to go in and manually revert the changes or do some history rewriting to fix it up.

Ok, that's why I tried it with merging testing from toltec-dev into testing from plan5.
But I can see how this reverts some files to previous states, looking at the PR changes now.

Before doing further radical steps: What do you think about this solution?

Clone into toltec-dev/toltec testing
Clone into plan5/toltec testing (where the gocryptfs package resides)
Delete all files (apart from .git/* and packages/gocryptfs/*) from the local plan5 testing branch
Copy all files (apart from .git/* and packages/gocryptfs/*) from the local toltec-dev/toltec testing branch into the local plan5 testing branch
git add -A&&git commit -m "Align with current upstream"
Push to plan5/toltec testing.

Or would this lead to potential further breakage? I can imagine that this would have to be redone before an actual merge in case there were further changes to the testing branch until then. But as I understand it, they would be applied on top of this commit so it wouldn't be a problem.

The more manual method seems to do the same to me (look at the commit changes of the PR and identify all files that are changed but shouldn't be and undo the changes locally, then commit and push).

Eeems · 2021-04-26T16:27:09Z

At this point I'd just suggest recreating this branch with the files in the state you want them to be in.

plan5 · 2021-04-26T18:37:45Z

So that would imply creating a new PR or is there a way to keep this one? I assume recreating the branch would break the PR.

I've tried my suggestion and re-added the gocryptfs package. Right now it would merge without changing anyhing apart from the gocryptfs package, btw.

Eeems · 2021-04-26T19:07:01Z

So that would imply creating a new PR or is there a way to keep this one? I assume recreating the branch would break the PR.

No need to create a new PR, just force push the new branch.

I've tried my suggestion and re-added the gocryptfs package. Right now it would merge without changing anyhing apart from the gocryptfs package, btw.

By the looks of it this worked, so we can review it as is instead of replacing the branch.

*Add gocryptfs package Co-authored-by: plan5 <plan5 30434574+plan5@users.noreply.github.com> Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com> Co-authored-by: Mattéo Delabre <1370040+matteodelabre@users.noreply.github.com>

Important notices: * When upgrading, users should run `opkg update && opkg upgrade` **twice** because of the changes introduced by this merge. (#310) * Toltec **no longer supports** OS releases **earlier than 2.6**. You can check your current OS version in the settings panel. Please upgrade to 2.6 or newer after upgrading your Toltec install. (#366) * To re-enable Toltec, **run `toltecctl reenable`** instead of the previous `entware-reenable` script that has been removed with this update. Major change: The repository is now split into architecture subfolders. The `rmall` subfolder contains packages that can run both on reMarkable 1 and reMarkable 2 without modification. The `rm1` and `rm2` subfolders contain packages that are specific to each of the two devices. This change requires updating the Opkg configuration to point to the appropriate architectures. The migration is automated by placing an upgrade to the `toltec-bootstrap` package in the root folder of the repo that contains a migration script. (Note that this package is not generated automatically by our build system but will be added manually by the server administrator.) New packages: * bash-completion - 2.11-3 (#277, #375) * display - 1.0.1-7 _(replaces the server part of the old rm2fb package)_ (#310) * fuse - 1.0.0-2 (#331) * gocryptfs - 2.0-beta2 (#318) * innernet - 1.3.1-2 (#350, #358, #361) * netsurf - 0.4.0-1 (#339) * puzzles - 0.2.2-2 (#326) * remarkable-stylus - 0.0.3-1 (#383) * rm2fb-client - 1.0.1-7 _(replaces the client part of the old rm2fb package)_ (#310) * tilem - 0.0.7-1 (#352) * toltec-completion - 0.2.0-1 (#277) * yaft - 0.0.4-3 (#261, #353) * zoneinfo-utils - 2021a-2 (#182) Updated packages: * appmarkable - 0.0.0-11 * bufshot - 0.1.0-5 * calculator - 0.0.0-15 * chessmarkable - 0.7.1-2 (#362, #373) * ddvk-hacks - 23.02-1 (#385) * draft - 0.2.0-20 * evtest - 1.34-3 * fbink fbdepth fbink-doom - 1.23.1-4 * fingerterm - 1.3.5-14 * genie - 0.1.5-3 * harmony - 0.1.3-3 * iago - 0.1.0-4 * keywriter - 0.1.0-3 * koreader - 2021.06-1 (#330, #348, #357, #378) * lamp - 0.1.0-4 * libdlib libdlib-dev - 19.21-2 * libvncserver libvncclient libvncserver-dev - 0.9.13-2 * mines - 0.1.2-4 * nao - 0.1.3-3 * oxide erode fret rot tarnish decay corrupt anxiety - 2.2-1 (#382) * plato - 0.9.17-2 (#344) * quickjs - 2020.11.08-2 * recrossable - 0.0.0-7 * remarkable-splash - 1.0-5 * remux - 0.1.9-3 * restream - 1.1-2 * retris - 0.6.3-3 * rmservewacominput - 0.3.0-2 * simple - 0.1.4-3 * templatectl - 0.1.3-3 * toltec-bootstrap - 0.1.0-1 _(includes toltecctl)_ (#379) * vnsee - 0.4.0-2 (#355) * wikipedia - 0.1.0-3 * wireguard - 1.0.20210219-2 * xochitl - 0.0.0-7 (#383, #382, #386) * zshelf - 0.3.1-3 Website: The source files and scripts used for generating the website have been transferred to a separate repository (<https://github.com/toltec-dev/web>). A website rebuild is triggered automatically from this repository’s workflow when the stable branch is updated, so that the displayed checksum of the bootstrap script is always accurate.

Important notices: * When upgrading, users should run `opkg update && opkg upgrade` **twice** because of the changes introduced by this merge. (#310) * Toltec **no longer supports** OS releases **earlier than 2.6**. You can check your current OS version in the settings panel. If you’re still running on 2.5 or earlier, please upgrade to 2.6 or newer after upgrading your Toltec install. (#366) Less important notices: * To re-enable Toltec after a system upgrade, **run `toltecctl reenable`** instead of the previous `entware-reenable` script that has been removed with this update. * You can now easily uninstall Toltec by running `toltec uninstall`. * This release marks the end of our work towards transitioning to a new repository layout. This means that **stable will be updated more frequently from now on.** If you switched to the testing branch because stable has been outdated for a few months, and if you prefer to run stable releases, you can go back to the stable branch by running `toltecctl switch-branch stable`. Layout change: The repository is now split into architecture subfolders. The `rmall` subfolder contains packages that can run both on reMarkable 1 and reMarkable 2 without modification. The `rm1` and `rm2` subfolders contain packages that are specific to each of the two devices. This change requires updating the Opkg configuration to point to the appropriate architectures. The migration is automated by placing an upgrade to the `toltec-bootstrap` package in the root folder of the repo that contains a migration script. New packages: * bash-completion - 2.11-3 (#277, #375) * display - 1.0.1-7 _(replaces the server part of the old rm2fb package)_ (#310) * fuse - 1.0.0-3 (#331) * gocryptfs - 2.0-beta2 (#318) * innernet-client - 1.3.1-2 (#350, #358, #361) * netsurf - 0.4.0-2 (#339) * puzzles - 0.2.2-3 (#326) * remarkable-stylus - 0.0.3-1 (#383) * rm2fb-client - 1.0.1-7 _(replaces the client part of the old rm2fb package)_ (#310) * tilem - 0.0.7-2 (#352) * toltec-completion - 0.2.0-1 (#277) * yaft - 0.0.4-4 (#261, #353) * zoneinfo-utils - 2021a-2 (#182) Updated packages: * appmarkable - 0.0.0-11 * bufshot - 0.1.0-5 * calculator - 0.0.0-15 * chessmarkable - 0.8.0-1 (#362, #373, #392) * ddvk-hacks - 23.02-1 (#385) * draft - 0.2.0-20 * evtest - 1.34-3 * fbink fbdepth fbink-doom - 1.23.2-1 (#387) * fingerterm - 1.3.5-14 * genie - 0.1.5-3 * harmony - 0.1.3-3 * iago - 0.1.0-4 * keywriter - 0.1.0-3 * koreader - 2021.07-1 (#330, #348, #357, #378, #389) * lamp - 0.1.0-4 * libdlib libdlib-dev - 19.21-2 * libvncserver libvncclient libvncserver-dev - 0.9.13-2 * mines - 0.1.2-4 * nao - 0.1.3-3 * oxide erode fret rot tarnish decay corrupt anxiety - 2.2.1-1 (#382) * plato - 0.9.17-2 (#344) * quickjs - 2020.11.08-2 * recrossable - 0.0.0-7 * remarkable-splash - 1.0-5 * remux - 0.1.9-4 * restream - 1.1-2 * retris - 0.6.3-3 * rmservewacominput - 0.3.0-2 * simple - 0.1.4-3 * templatectl - 0.1.3-3 * toltec-bootstrap - 0.1.0-1 _(includes toltecctl)_ (#379) * vnsee - 0.4.0-2 (#355) * wikipedia - 0.1.0-3 * wireguard - 1.0.20210219-2 * xochitl - 0.0.0-7 (#383, #382, #386) * zshelf - 0.3.1-3 Website: The source files and scripts used for generating the website have been transferred to a separate repository (<https://github.com/toltec-dev/web>). A website rebuild is triggered automatically from this repository’s workflow when the stable branch is updated, so that the displayed checksum of the bootstrap script is always accurate.

plan5 added 2 commits March 22, 2021 22:41

First working version of gocryptfs package

1d86a93

Fix timestamp of gocryptfs package

78054e9

Eeems reviewed Mar 22, 2021

View reviewed changes

package/gocryptfs/package Outdated Show resolved Hide resolved

Eeems reviewed Mar 22, 2021

View reviewed changes

package/gocryptfs/package Outdated Show resolved Hide resolved

Eeems reviewed Mar 22, 2021

View reviewed changes

package/gocryptfs/package Outdated Show resolved Hide resolved

plan5 and others added 4 commits March 22, 2021 23:26

Remove trailing spaces

63509b5

Merge branch 'testing' into testing

dcea1c5

Update package/gocryptfs/package

69ad7cb

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>

Remove the v from srcver

c802e74

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>

Eeems requested changes Mar 23, 2021

View reviewed changes

package/gocryptfs/package Outdated Show resolved Hide resolved

plan5 and others added 4 commits March 23, 2021 17:31

gocryptfs: put srcdir variable in quotes

df2f49d

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>

Switch build image to golang:v1.5 and remove golang makedeps

ac119e9

Merge branch 'testing' of https://www.github.com/plan5/toltec into te…

c460fd8

…sting

Merge branch 'testing' into testing

856ab5b

plan5 added 2 commits March 23, 2021 17:42

Quote all variables

a5eeaf4

Merge branch 'testing' of https://www.github.com/plan5/toltec into te…

caa8160

…sting

Eeems reviewed Mar 23, 2021

View reviewed changes

package/gocryptfs/package Outdated Show resolved Hide resolved

Remove obsolete makedeps (git)

889945c

plan5 requested a review from Eeems March 23, 2021 17:13

Merge branch 'testing' into testing

494ee4d

Eeems previously approved these changes Apr 20, 2021

View reviewed changes

plan5 added 2 commits April 23, 2021 08:28

Remove gocryptfs from local testing branch

127565d

Merge branch 'testing' of https://www.github.com/plan5/toltec into te…

324dc3a

…sting

plan5 dismissed Eeems’s stale review via 324dc3a April 24, 2021 11:29

plan5 added 2 commits April 25, 2021 19:14

Revert "Merge branch 'testing' of https://www.github.com/plan5/toltec …

83d306d

…into testing" This reverts commit 324dc3a, reversing changes made to 127565d.

Revert "Remove gocryptfs from local testing branch"

50447f3

This reverts commit 127565d.

Merge remote-tracking branch 'toltec-dev/toltec/testing' into testing

38dcf1a

plan5 added 2 commits April 26, 2021 20:32

Align with upstream testing

ade9ed2

Re-add gocryptfs

93201db

Eeems added 2 commits May 3, 2021 09:28

Merge branch 'testing' into testing

7ad164e

Merge branch 'testing' into testing

a82223b

Eeems approved these changes May 17, 2021

View reviewed changes

Eeems merged commit d39af6f into toltec-dev:testing May 17, 2021

matteodelabre mentioned this pull request Jul 21, 2021

Stable merge for week 29 of 2021 #391

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[gocryptfs] Add gocryptfs package (build without openssl) #318

[gocryptfs] Add gocryptfs package (build without openssl) #318

plan5 commented Mar 22, 2021

matteodelabre commented Mar 23, 2021

plan5 commented Mar 23, 2021

plan5 commented Mar 23, 2021

Eeems commented Mar 23, 2021

plan5 commented Mar 23, 2021

Eeems commented Mar 23, 2021

Eeems commented Mar 23, 2021 •

edited

Loading

plan5 commented Mar 23, 2021

plan5 commented Mar 23, 2021

Eeems commented Mar 23, 2021

plan5 commented Mar 23, 2021

plan5 commented Apr 20, 2021

Eeems commented Apr 20, 2021

Eeems left a comment

Eeems commented Apr 24, 2021

plan5 commented Apr 24, 2021 •

edited by Eeems

Loading

plan5 commented Apr 25, 2021

Eeems commented Apr 25, 2021

plan5 commented Apr 26, 2021

Eeems commented Apr 26, 2021 •

edited

Loading

plan5 commented Apr 26, 2021

Eeems commented Apr 26, 2021

plan5 commented Apr 26, 2021

Eeems commented Apr 26, 2021

[gocryptfs] Add gocryptfs package (build without openssl) #318

[gocryptfs] Add gocryptfs package (build without openssl) #318

Conversation

plan5 commented Mar 22, 2021

matteodelabre commented Mar 23, 2021

plan5 commented Mar 23, 2021

plan5 commented Mar 23, 2021

Eeems commented Mar 23, 2021

plan5 commented Mar 23, 2021

Eeems commented Mar 23, 2021

Eeems commented Mar 23, 2021 • edited Loading

plan5 commented Mar 23, 2021

plan5 commented Mar 23, 2021

Eeems commented Mar 23, 2021

plan5 commented Mar 23, 2021

plan5 commented Apr 20, 2021

Eeems commented Apr 20, 2021

Eeems left a comment

Choose a reason for hiding this comment

Eeems commented Apr 24, 2021

plan5 commented Apr 24, 2021 • edited by Eeems Loading

plan5 commented Apr 25, 2021

Eeems commented Apr 25, 2021

plan5 commented Apr 26, 2021

Eeems commented Apr 26, 2021 • edited Loading

plan5 commented Apr 26, 2021

Eeems commented Apr 26, 2021

plan5 commented Apr 26, 2021

Eeems commented Apr 26, 2021

Eeems commented Mar 23, 2021 •

edited

Loading

plan5 commented Apr 24, 2021 •

edited by Eeems

Loading

Eeems commented Apr 26, 2021 •

edited

Loading