On Mon, 4 Nov 2013 11:41:50 +0000 (UTC)
intrigeri <intrigeri@???> wrote:
[...]
> I think the best way to handle it is:
>
> * killyourtv maintains a Tails-experimental suite in their APT
> repository.
Done. The sources line is:
deb http://deb.i2p2.no tails-experimental main
As promised previously, the packages in this repo will not change until
after the next Tails release.
> * Optional: we patch auto/scripts/tails-custom-apt-sources to
> include this suite when building from our experimental branch.
> This makes the next step easier.
I haven't done this (but could take a stab at it).
> * When s/he wants Tails to get a newer version of I2P, killyourtv
> uploads it to their Tails-experimental APT suite and asks for
> a review'n'merge. Most of the times, no change is needed in Tails
> source code, but when it's needed, then the review'n'merge request
> must include a feature/i2p-$version branch.
I think I'm ready to have other eyes on it. I branched off of 'devel' a
few days ago.
http://repo.or.cz/w/tails/kytv.git/shortlog/refs/heads/feature/i2p-0.9.8.1
My commit comments tend to be verbose but hopefully they're not _too_
wordy for your use.
When building my own local Tails I also had the attached patch applied
to force the build to use my repo's packages. It's attached in case any
onlookers try building an image from my branch and wonder, "what did
s/he submit this for? It doesn't build with a newer I2P at all!" :)
The repository's key for secure apt is also attached and signed by me.
The repository key is also packaged at
http://deb.i2p2.no/pool/main/i/i2p-keyring/.
I think that covers everything. Please review and merge if it looks OK.
Thanks,
--
kytv
diff --git a/auto/scripts/tails-custom-apt-sources b/auto/scripts/tails-custom-apt-sources
index e8d0105..9053948 100755
--- a/auto/scripts/tails-custom-apt-sources
+++ b/auto/scripts/tails-custom-apt-sources
@@ -55,5 +55,7 @@ else
fi
if on_topic_branch; then
- output_apt_binary_source "$(branch_name_to_suite $(current_branch))"
+ if ! current_branch | grep -q i2p ; then
+ output_apt_binary_source "$(branch_name_to_suite $(current_branch))"
+ fi
fi
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index dba8a2c..d7fd2ec 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -368,6 +368,33 @@ Package: *
Pin: release o=chroot_local-packages
Pin-Priority: 1010
+Explanation: bump so that my newer packages are installed
+Package: i2p
+Pin: origin deb.i2p2.no
+Pin-Priority: 1010
+
+Package: i2p-router
+Pin: origin deb.i2p2.no
+Pin-Priority: 1010
+
+Package: libjbigi-jni
+Pin: origin deb.i2p2.no
+Pin-Priority: 1010
+
+Explanation: The Tanuki wrapper in Debian is quite old and doesn't offer umask settings.
+Explanation: See Debian bug #610374 for upgrade request.
+Package: service-wrapper
+Pin: origin deb.i2p2.no
+Pin-Priority: 1000
+
+Package: libservice-wrapper-jni
+Pin: origin deb.i2p2.no
+Pin-Priority: 1000
+
+Package: libservice-wrapper-java
+Pin: origin deb.i2p2.no
+Pin-Priority: 1000
+
Package: *
Pin: origin deb.tails.boum.org
Pin-Priority: 1005
diff --git a/config/chroot_sources/i2p.binary b/config/chroot_sources/i2p.binary
new file mode 100644
index 0000000..d811e23
--- /dev/null
+++ b/config/chroot_sources/i2p.binary
@@ -0,0 +1 @@
+deb
http://deb.i2p2.no tails-experimental main
diff --git a/config/chroot_sources/i2p.binary.gpg b/config/chroot_sources/i2p.binary.gpg
new file mode 100644
index 0000000..45d49b3
--- /dev/null
+++ b/config/chroot_sources/i2p.binary.gpg
@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+mQINBFJXM+IBEAC4d7PbH0ZZjOld1DBu0rFAjZYITMa0yFCqOEbRGd3gdMeMx21h
+TJ8B2gICRL6UJL/GFN9HieSzQGAd9ABf924/UQyZJ+zMwt3x0bYAfC8SMWg5XgHM
+rR4M9v+aUZ5fsqwXEoKVI0AC3z3e6IutRota6/mpsuFaHwjzsv/0elFa6aapK6D+
+ZYHCQLXEk72RokmYcIxYaNZilgNjKf0IYS5wwEg9NZqiUyaJr9dvQb8uYQMNt0MK
+7Lklm5aepFOS+KmThnFTZb5l3UYr/rNvpMmHmS8XpNBvtoga0YNXMYjrPf9QdvjP
+1V0dMdOF6rSPkq7sTKDyF713ovSLxgtnibqhp9LgQcjyA43591Fg7cmwNu42ccd2
+Frdt+BxpYjzYu49d+pxQJXoSwPSQFuAE5V0AkuQeng/IxpW3zi6ybJJWOwvxeq2Z
+RdNjzpwu0vUYsLELdsCW88etc141n7O9P5L3s4o7PYHE/y3N47PwDgb43cErvTcF
+bIP2aEmJnyIbOWwiCftnxaKlfAbv0g7TNho5HX66OreR4Fb5vUkoIfzte/fxZKOL
+R/hhNTH1fZNEaIaxHwvitfQe8xPsLgR/O3PoXd74UOJuwOwcf0LROgNaN5O+0rmD
+5eAbVn7CYd7ZQPIRRKlHrFsQDg4u5jEt7GVd+jYsEF9A6fK7npNhCkNAnwARAQAB
+tDZJMlAgRGViaWFuIFBhY2thZ2UgUmVwb3NpdG9yeSA8a2lsbHlvdXJ0dkBpMnBt
+YWlsLm9yZz6JAj0EEwEKACcFAlJXM+ICGwMFCQHhM4AFCwkIBwMFFQoJCAsFFgID
+AQACHgECF4AACgkQZ+zlYFvPE0ajKBAAr64De1vMJb+SzqW20fCFyOmG/QbFgGK9
+FeJzDaZ8lcGDFiMtMvm7IkL0jAKQl5bInsAA26SQq4j1gEU3DIx2mJT4i+ZztDLO
+Tv3XxO6DuVdPMtNEH3AKiRufwGH/HtudtAyUy7gwIYg2qhRVR3hz7iHs9WbgkkXy
+6Qp/WCYJGuH74hXIQtW+Cyyded50vjm8uPqYuRUfze6jetZkWUSkAmqbzZhfHPv1
+ju5GptHWH+9Z4q9fvr1LZ09eHy+XfnxE/NpP4nfXJ42F9/QpNDEPgT8DTp3NknpS
+N95EDhKduHGX1rBAjc4ZQE6L+gTS2DJq5ozgAM/sFfH9uL+kULx7lzbXTpwL1Zd8
+fVwrmGM81duOZ7erFlpRqYKn6aVdLbQFxcLz6Q4WUBuHd4XBE5WilYvTyOPB/mYf
+TmWBaTS4glYz3cFKi9J8LSaW6b8/ik9gVS6Z7wPckWHuWWIRdcKk3zJZoXeOzrTZ
+KX+z2uATkX7Tfpd07o4wwSRmWevFGniGL1ml+abanpIGHt8h79/gscEQ8aQdD+i0
+dNjqgpLTS1TL0aQ0sJ/UD5EexbMuWKIGatABVguuofrK77GmGTcz1LL3mGJV0HIR
+vXjFOx3tEV5HYdDJK9gq1W0JKxYmE+paw8PFaM5+vnXP0xoTz75KKlL3N1Ra6/mG
+whIPAIaMfhiJARwEEAEKAAYFAlJYlBAACgkQq+DDGd8KChoHcgf8DegR4gl6F4uy
+YnHXKSubJYHSfWGHaKe7msoCjAna13BtKkZXj2DWDLUmMCwI/qHvQT1V9mNwsBgW
+nAagKATeB+bhumg9/xbBAKndaowHTuGI0wZ9uXbXaxxlpXbODFScBoR86CCeJa4F
+3N5RwWZryv3MwlLc109aEaCriL9nNb/K2OZ98I9i+K2SdT5mITk3FeAgzD+UrVqL
+oYNQ677BpsJQfvTvOP6PiFpXbVVzRouhQX6a7Dzkd2rzjLRNeAc2gp0+n4U1j8N0
+HTRvBAX6RRv6BZNLWtS21bqwPtcrTJ9qr8aLbWyjWbBTFqRR4lAUn0vDQBfA5B2Z
+z+b2yx4iqA==
+=ZkNG
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/chroot_sources/i2p.chroot b/config/chroot_sources/i2p.chroot
new file mode 100644
index 0000000..d811e23
--- /dev/null
+++ b/config/chroot_sources/i2p.chroot
@@ -0,0 +1 @@
+deb
http://deb.i2p2.no tails-experimental main
diff --git a/config/chroot_sources/i2p.chroot.gpg b/config/chroot_sources/i2p.chroot.gpg
new file mode 100644
index 0000000..45d49b3
--- /dev/null
+++ b/config/chroot_sources/i2p.chroot.gpg
@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+mQINBFJXM+IBEAC4d7PbH0ZZjOld1DBu0rFAjZYITMa0yFCqOEbRGd3gdMeMx21h
+TJ8B2gICRL6UJL/GFN9HieSzQGAd9ABf924/UQyZJ+zMwt3x0bYAfC8SMWg5XgHM
+rR4M9v+aUZ5fsqwXEoKVI0AC3z3e6IutRota6/mpsuFaHwjzsv/0elFa6aapK6D+
+ZYHCQLXEk72RokmYcIxYaNZilgNjKf0IYS5wwEg9NZqiUyaJr9dvQb8uYQMNt0MK
+7Lklm5aepFOS+KmThnFTZb5l3UYr/rNvpMmHmS8XpNBvtoga0YNXMYjrPf9QdvjP
+1V0dMdOF6rSPkq7sTKDyF713ovSLxgtnibqhp9LgQcjyA43591Fg7cmwNu42ccd2
+Frdt+BxpYjzYu49d+pxQJXoSwPSQFuAE5V0AkuQeng/IxpW3zi6ybJJWOwvxeq2Z
+RdNjzpwu0vUYsLELdsCW88etc141n7O9P5L3s4o7PYHE/y3N47PwDgb43cErvTcF
+bIP2aEmJnyIbOWwiCftnxaKlfAbv0g7TNho5HX66OreR4Fb5vUkoIfzte/fxZKOL
+R/hhNTH1fZNEaIaxHwvitfQe8xPsLgR/O3PoXd74UOJuwOwcf0LROgNaN5O+0rmD
+5eAbVn7CYd7ZQPIRRKlHrFsQDg4u5jEt7GVd+jYsEF9A6fK7npNhCkNAnwARAQAB
+tDZJMlAgRGViaWFuIFBhY2thZ2UgUmVwb3NpdG9yeSA8a2lsbHlvdXJ0dkBpMnBt
+YWlsLm9yZz6JAj0EEwEKACcFAlJXM+ICGwMFCQHhM4AFCwkIBwMFFQoJCAsFFgID
+AQACHgECF4AACgkQZ+zlYFvPE0ajKBAAr64De1vMJb+SzqW20fCFyOmG/QbFgGK9
+FeJzDaZ8lcGDFiMtMvm7IkL0jAKQl5bInsAA26SQq4j1gEU3DIx2mJT4i+ZztDLO
+Tv3XxO6DuVdPMtNEH3AKiRufwGH/HtudtAyUy7gwIYg2qhRVR3hz7iHs9WbgkkXy
+6Qp/WCYJGuH74hXIQtW+Cyyded50vjm8uPqYuRUfze6jetZkWUSkAmqbzZhfHPv1
+ju5GptHWH+9Z4q9fvr1LZ09eHy+XfnxE/NpP4nfXJ42F9/QpNDEPgT8DTp3NknpS
+N95EDhKduHGX1rBAjc4ZQE6L+gTS2DJq5ozgAM/sFfH9uL+kULx7lzbXTpwL1Zd8
+fVwrmGM81duOZ7erFlpRqYKn6aVdLbQFxcLz6Q4WUBuHd4XBE5WilYvTyOPB/mYf
+TmWBaTS4glYz3cFKi9J8LSaW6b8/ik9gVS6Z7wPckWHuWWIRdcKk3zJZoXeOzrTZ
+KX+z2uATkX7Tfpd07o4wwSRmWevFGniGL1ml+abanpIGHt8h79/gscEQ8aQdD+i0
+dNjqgpLTS1TL0aQ0sJ/UD5EexbMuWKIGatABVguuofrK77GmGTcz1LL3mGJV0HIR
+vXjFOx3tEV5HYdDJK9gq1W0JKxYmE+paw8PFaM5+vnXP0xoTz75KKlL3N1Ra6/mG
+whIPAIaMfhiJARwEEAEKAAYFAlJYlBAACgkQq+DDGd8KChoHcgf8DegR4gl6F4uy
+YnHXKSubJYHSfWGHaKe7msoCjAna13BtKkZXj2DWDLUmMCwI/qHvQT1V9mNwsBgW
+nAagKATeB+bhumg9/xbBAKndaowHTuGI0wZ9uXbXaxxlpXbODFScBoR86CCeJa4F
+3N5RwWZryv3MwlLc109aEaCriL9nNb/K2OZ98I9i+K2SdT5mITk3FeAgzD+UrVqL
+oYNQ677BpsJQfvTvOP6PiFpXbVVzRouhQX6a7Dzkd2rzjLRNeAc2gp0+n4U1j8N0
+HTRvBAX6RRv6BZNLWtS21bqwPtcrTJ9qr8aLbWyjWbBTFqRR4lAUn0vDQBfA5B2Z
+z+b2yx4iqA==
+=ZkNG
+-----END PGP PUBLIC KEY BLOCK-----
