Dev/git

Branches

Introduction

While the project is small adrelanos thinks it is best not to make a too difficult policy.

master

• Adrelanos's progress of work.
• Not calling it unstable, because the changes will most likely never make it unstable but it is just not tested if it still builds.
• Branching model, project readme, information, gpg...

stable

• last released and recommended Whonix version
• ready to include hotfixes

development

• does currently not exist, since only one adding code
• candidate for next Whonix version
• must always build
• currently restructuring
• we can make an always building development branch as soon as someone else commits code

signed git tags

Releases will be tagged and gpg signed.

temporary git tags

Will be named like: adretemp1 or 96adretemp

Can get deleted from time to time.

Link to Source Code

https://github.com/Whonix/Whonix

subscribe to code changes

git

Git clone github.

A git specific work flow could be:

git fetch

every (few) day(s) and then git diff(tool), merge, etc.

rss feed notification

https://github.com/Whonix/Whonix/commits/master.atom

manually in your browser

Check every now and then https://github.com/Whonix/Whonix/commits/master.

Github Commits Mailing List

Whonix-commits read only mailing list

(Stay hosted on sourceforge.net. Barely anyone is signed up and it is quite high traffic.)

Twitter

If you prefer Twitter, use the Secondary Twitter Account for Source Code Commit Notification.

grep Whonix source code

Get the Signing Key

This chapter is recommended for better security, but is not strictly required. (See Trust)

gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys 916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA

gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys 916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA

It isn't safe to only get the signing key from one source for the download you want to verify. For better security, learn more about the Whonix Signing Key.

Get the Source Code

FREE

Install git and curl.

sudo apt-get update && sudo apt-get install git curl

sudo apt-get update && sudo apt-get install git curl

Get source code including git submodules.

git clone --jobs=4 --recursive https://github.com/Whonix/Whonix

git clone --jobs=4 --recursive https://github.com/Whonix/Whonix

Note: If using an older version of git (from Debian Jessie, Whonix 13, etc), remove --jobs=4.

Remember it is Whonix, not whonix! If prompted for a username for github, you have mistyped the web address.

Shift to the source folder.

cd Whonix

cd Whonix

OpenPGP Verify the Source Code

This chapter is recommended for better security, but is not strictly required.

Retrieve a list of available git tags.

cd ~/Whonix/ && git tag

Verify the chosen tag to build.

## ... Replace with tag you want to build.
git verify-tag 14.0.1.4.4-stable

The output should look similar to this.

object 1844108109a5f2f8bddcf2257b9f3675be5cfb22
type commit
tag 14.0.1.4.4
tagger Patrick Schleizer <adrelanos@riseup.net> 1392320095 +0000

.
gpg: Signature made Thu 13 Feb 2014 07:34:55 PM UTC using RSA key ID 77BB3C48
gpg: Good signature from "Patrick Schleizer <adrelanos@riseup.net>" [ultimate]

The warning.

gpg: WARNING: This key is not certified with a trusted signature!
gpg:          There is no indication that the signature belongs to the owner.

Is explained on the Whonix Signing Key page and can be safely ignored.

By convention, git tags should point to signed git commits. (forum discussion) It is advisable to verify the signature of the git commit as well (replace 14.0.1.4.4 with the actual git tag being verified).

git verify-commit 14.0.1.4.4-stable^{commit}

The output should look similar to this.

commit 5aa1c307c943be60e7d2bfa5727fa5ada3a79c4a
gpg: Signature made Sun 07 Dec 2014 01:22:22 AM UTC using RSA key ID 77BB3C48
gpg: Good signature from "Patrick Schleizer <adrelanos@riseup.net>" [ultimate]
Author: Patrick Schleizer <adrelanos@riseup.net>
Date:   Sun Dec 7 01:22:22 2014 +0000

    .

Choose Version

Retrieve a list of available git tags.

git tag

Use git checkout to select the preferred version (or git branch) to build.

git checkout 14.0.1.4.4-stable

Replace 14.0.1.4.4 with the actual version chosen for the build: the stable, testers-only or developers version. Common sense is required when choosing the right version number. For example, the latest available version number is not necessarily the most stable or suitable. To learn more about current Whonix versions, follow the Whonix News Blog.

Clean Up and Sanitize

This step is also important for security.

Retrieve the list of extraneous files and folders.

git clean -ndff

See if the output looks sane; it generally should, unless Whonix source code is modified by advanced users (who understand git better anyhow). If the output looks like the following, everything is fine.

Would remove packages/apparmor-profile-gwenview/
Would remove packages/kde-privacy/

Remove these folders.

git clean -dff

The output should show.

Removing packages/apparmor-profile-gwenview/
Removing packages/kde-privacy/

Be sure to check out the right commit for each git submodule.

git submodule update --init --recursive

Check there are no extraneous files. This is important for security.

git status

The output should show the following:

nothing to commit (working directory clean)

If the directory is not clean, the extra files should be removed first.

grep

mkdir ~/bin

mkdir ~/bin

#!/bin/bash
set -x
exec \
grep \
--exclude=README.md \
--exclude=GPLv2 \
--exclude=GPLv3 \
--exclude=COPYING \
--exclude=changelog.upstream-old1 \
--exclude-dir=mnt \
--exclude-dir=qubes-src/linux-template-builder/mnt \
--exclude=changelog.upstream \
--exclude-dir=".git" \
--exclude-dir=chroot-debian \
--exclude-dir=chroot-stretch \
--exclude-dir=chroot-jessie "$@"

#!/bin/bash set -x exec \ grep \ --exclude=README.md \ --exclude=GPLv2 \ --exclude=GPLv3 \ --exclude=COPYING \ --exclude=changelog.upstream-old1 \ --exclude-dir=mnt \ --exclude-dir=qubes-src/linux-template-builder/mnt \ --exclude=changelog.upstream \ --exclude-dir=".git" \ --exclude-dir=chroot-debian \ --exclude-dir=chroot-stretch \ --exclude-dir=chroot-jessie "$@"

cd Whonix

cd Whonix

mygrep -r grub-pc

mygrep -r grub-pc

Put folder under Git Version Control

Setup

Update the package lists.

sudo apt-get update

sudo apt-get update

Install git.

sudo apt-get install git

sudo apt-get install git

Unless you want to use git for pushing changes to remotes which you probably won't in a testing VM you can use the following git config without using any real names or pseudonyms. (These are the git suggested defaults. )

git config --global user.email "you@example.com"

git config --global user.email "you@example.com"

git config --global user.name "Your Name"

git config --global user.name "Your Name"

Enable Git Version Control for Folder

Go to the folder you want to set under git version control.

cd ~

cd ~

Initialize git version control.

git init

git init

Add all files to git version control.

git add -A

git add -A

Commit all files to git.

git commit -a -m .

git commit -a -m .

Do changes such as changing KDE settings.

See what changed.

git diff

git diff

Goodies

Optional. Just sharing. Like it or not.

• Bash completion can complete git commands and branch names.
• Colorful git prompt.

screenshot

apt-get source

You need to enable deb-src in /etc/apt/sources.list.d/whonix.list!

sudo apt-get update

Hit:1 tor+http://deb.dds6qkxpwdeubwucdiaord2xgbbeyds25rbsgr73tbfpqpt4a6vjwsyd.onion stretch InRelease
Hit:2 http://deb.qubes-os.org/r4.0/vm stretch InRelease                                            
Ign:3 tor+http://vwakviie2ienjx6t.onion/debian stretch InRelease                                   
Hit:4 tor+http://sgvtcaew4bxjd7ln.onion stretch/updates InRelease                                  
Hit:5 tor+http://vwakviie2ienjx6t.onion/debian stretch Release                                     
Ign:7 http://ftp.us.debian.org/debian stretch InRelease                                            
Hit:8 http://security.debian.org stretch/updates InRelease                                  
Hit:9 http://ftp.us.debian.org/debian stretch Release                                       
Hit:11 http://deb.whonix.org stretch InRelease                             
Reading package lists... Done 
E: Failed to fetch tor+http://deb.dds6qkxpwdeubwucdiaord2xgbbeyds25rbsgr73tbfpqpt4a6vjwsyd.onion/dists/stretch/InRelease  Unable to find expected entry 'contrib/source/Sources' in Release file (Wrong sources.list entry or malformed file)
E: Failed to fetch http://deb.whonix.org/dists/stretch/InRelease  Unable to find expected entry 'non-free/source/Sources' in Release file (Wrong sources.list entry or malformed file)
E: Some index files failed to download. They have been ignored, or old ones used instead.

The following can be ignored:

• "Unable to find expected entry 'contrib/source/Sources'" and
• "Unable to find expected entry 'non-free/source/Sources'"

There is nothing in these repositories. Does not limit functionality in any way. Inconinent message but won't fix since only asked once in 5 years.

apt-get source fully functional.

apt-get source apparmor-profiles-hardened-debian

Reading package lists... Done
Picking 'anon-meta-packages' as source package instead of 'apparmor-profiles-hardened-debian'
NOTICE: 'anon-meta-packages' packaging is maintained in the 'Git' version control system at:
https://github.com/Whonix/anon-meta-packages.git
Please use:
git clone https://github.com/Whonix/anon-meta-packages.git
to retrieve the latest (possibly unreleased) updates to the package.
Need to get 48.9 kB of source archives.
Get:1 tor+http://deb.dds6qkxpwdeubwucdiaord2xgbbeyds25rbsgr73tbfpqpt4a6vjwsyd.onion stretch/main anon-meta-packages 3:7.9-1 (dsc) [5,513 B]
Get:2 tor+http://deb.dds6qkxpwdeubwucdiaord2xgbbeyds25rbsgr73tbfpqpt4a6vjwsyd.onion stretch/main anon-meta-packages 3:7.9-1 (tar) [37.8 kB]
Get:3 tor+http://deb.dds6qkxpwdeubwucdiaord2xgbbeyds25rbsgr73tbfpqpt4a6vjwsyd.onion stretch/main anon-meta-packages 3:7.9-1 (diff) [5,588 B]
Fetched 48.9 kB in 2s (19.4 kB/s)             
dpkg-source: info: extracting anon-meta-packages in anon-meta-packages-7.9
dpkg-source: info: unpacking anon-meta-packages_7.9.orig.tar.xz
dpkg-source: info: unpacking anon-meta-packages_7.9-1.debian.tar.xz

---

No user support in comments. See Support.

Comments will be deleted after some time. Specifically after comments have been addressed in form of wiki enhancements. See Wiki Comments Policy.

Sort by date Sort by score

Enable comment auto-refresher

Add your comment

Whonix welcomes all comments. If you do not want to be anonymous, register or log in. It is free.

---

Random News:

Please contribute by helping to answer Whonix questions.

---

https | (forcing) onion

Share: Twitter | Facebook

This is a wiki. Want to improve this page? Help is welcome and volunteer contributions are happily considered! Read, understand and agree to Conditions for Contributions to Whonix, then Edit! Edits are held for moderation.

Copyright (C) 2012 - 2019 ENCRYPTED SUPPORT LP. Whonix is a trademark. Whonix is a licensee of the Open Invention Network. Unless otherwise noted, the content of this page is copyrighted and licensed under the same Freedom Software license as Whonix itself. (Why?)

By using our website, you acknowledge that you have read, understood and agreed to our Privacy Policy, Cookie Policy, Terms of Service, and E-Sign Consent. Whonix is provided by ENCRYPTED SUPPORT LP. See Imprint.