alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
86346 commits 217 branches 121 tags 4.5 GiB
Commit graph

911 commits

Author SHA1 Message Date
William A. Kennington III abb8fc3fdd gnupg: 2.0.28 -> 2.0.29 2015-09-08 16:28:49 -07:00
Rommel M. Martinez d6673e845c chkrootkit: 0.48 -> 0.50 2015-09-08 02:07:41 +08:00
Austin Seipp 8a74451273 nixpkgs: scrypt 1.1.6 -> 1.2.0 
Now with less build breakage!
 2015-08-31 07:54:49 -05:00
Austin Seipp 7399c600e4 Revert "nixpkgs: scrypt 1.1.6 -> 1.2.0" 
This breaks the build. :(

This reverts commit 4022e07c1e.
 2015-08-31 05:43:40 -05:00
Austin Seipp 4022e07c1e nixpkgs: scrypt 1.1.6 -> 1.2.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:17 -05:00
Austin Seipp b1f502b94e nixpkgs: afl 1.86b -> 1.88b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:16 -05:00
Austin Seipp e84c8772c9 nixpkgs: nmap 6.47 -> 6.49BETA4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:16 -05:00
Domen Kožar e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Kosyrev Serge 432c43dabf chntpw: add myself as maintainer 2015-08-24 22:55:13 +03:00
William A. Kennington III 901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
Paulus Esterhazy f683031df2 pass: Fix for Darwin 2015-08-19 20:50:58 +02:00
Arseniy Seroka b9a174b9e3 Merge pull request #9340 from obadz/ecryptfs 
ecryptfs
 2015-08-19 14:37:36 +03:00
obadz 172522e153 ecryptfs: 
- upgrade 106 -> 108
- fix passphrase rewrapper (password changing should now work fine) as
  discussed on https://bugs.launchpad.net/ecryptfs/+bug/1486470
- add lsof dependency so ecryptfs-migrate-home should work out of the
  box
 2015-08-19 12:16:57 +01:00
William A. Kennington III 2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Austin Seipp 5d964375e5 nixpkgs: afl 1.83b -> 1.86b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-17 17:18:10 -05:00
Pascal Wittmann 789ae5333b logkeys: move from googlecode to github 2015-08-15 21:04:32 +02:00
William A. Kennington III a106080623 Merge branch 'master.upstream' into staging.upstream 2015-08-14 13:22:00 -07:00
Tobias Geerinckx-Rice a913ad89c1 eid-mw: 4.1.4 -> 4.1.5 2015-08-14 03:07:10 +02:00
William A. Kennington III 952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Vladimír Čunát 7307f5c011 stoken: fix evaluation (licence), refactor a little 
I hope @fuuzetsu doesn't mind the refactoring.
BTW, do you know about `autoreconfHook`? It might save the preConfigure
and most buildInputs.
 2015-08-13 14:18:36 +02:00
Mateusz Kowalczyk bf37974165 stoken: add new package 2015-08-13 13:07:39 +01:00
William A. Kennington III aec624a72e pinentry: 0.9.4 -> 0.9.5 2015-08-12 17:13:27 -07:00
William A. Kennington III 997b9bc8c6 gnupg21: 2.1.6 -> 2.1.7 2015-08-12 17:02:14 -07:00
Boris Sukholitko c2f5d1abed nsjail: init at 8b951e6 2015-08-10 22:27:15 +03:00
William A. Kennington III 4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Pascal Wittmann dd06e36eb8 sbsigntool: only build for x86_64-linux, it is broken on i686 2015-08-06 15:59:51 +02:00
William A. Kennington III baf0967947 ccid: 1.4.19 -> 1.4.20 2015-08-05 19:25:56 -07:00
William A. Kennington III 23c3edd62c pcsclite: 1.8.13 -> 1.8.14 2015-08-05 19:25:56 -07:00
William A. Kennington III a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
ts468 1857db1bc9 Merge pull request #9100 from ts468/upstream.omapd 
omapd: init at 0.9.2
 2015-08-03 13:12:28 +02:00
Thomas Strobel 89e78b5211 omapd: init at 0.9.2 2015-08-03 13:04:59 +02:00
William A. Kennington III 1dab05033f Merge branch 'master.upstream' into staging.upstream 2015-08-01 19:18:08 -07:00
Joachim Fasting 56b39c2cc5 minisign: init at 0.4 2015-08-01 17:20:15 +02:00
Arseniy Seroka b6160fa736 monkeysphere: fix description 2015-08-01 13:28:41 +03:00
Fabian Kirchner b80df37494 Add monkeysphere package 2015-08-01 12:01:32 +02:00
William A. Kennington III 09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Tobias Geerinckx-Rice 03b09e7cd4 eid-viewer: 4.0.7-195-tcm406-258907 -> 4.1.4-v4.1.4-tcm406-270732 2015-07-31 04:47:59 +02:00
Tobias Geerinckx-Rice 7b30d6a8cb sudo: add withInsults flag (disabled by default) 
The feature Nix neither needs nor deserves.
Requires the "insults" to be explicitly enabled in sudoers.
This adds 1.6 MB to your sudo as some kind of cruel meta-joke.
 2015-07-31 02:02:08 +02:00
Tobias Geerinckx-Rice 6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
Eelco Dolstra 55932c1bec Don't statically depend on cacert for certificates 
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
 2015-07-31 01:34:58 +02:00
William A. Kennington III 7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Tobias Geerinckx-Rice 9294f368f9 eid-mw: 4.1.2 -> 4.1.4 2015-07-30 16:18:37 +02:00
Lancelot SIX ca54849eb9 torbrowser: 4.5.2 -> 4.5.3 (close #8953) 2015-07-30 15:55:22 +02:00
William A. Kennington III 0a1a015355 Merge pull request #8981 from sellout/patch-1 
gnugpg: Add libiconv dependency.
 2015-07-27 15:50:54 -04:00
Greg Pfeil 2cbfdb8ff4 gnugpg: Add libiconv dependency. 
Tested using the pure-darwin alternate stdenv on Yosemite.

I need this change for gnupg to build. Otherwise, I get this error:

```
configure:
***
*** The system does not provide a working iconv function.  Please
*** install a suitable library; for example GNU Libiconv which is
*** available at:
***   http://ftp.gnu.org/gnu/libiconv/
***
configure: error:
***
*** Required libraries not found. Please consult the above messages
*** and install them before running configure again.
***
builder for ‘/nix/store/pvzqmfzc05ifmvi0vglyl2xlkcdgh6c2-gnupg-2.1.6.drv’ failed with exit code 1
```

cc: @wkennington
 2015-07-27 11:53:34 -06:00
William A. Kennington III b827583831 sudo: 1.8.14p1 -> 1.8.14p3 2015-07-22 11:26:59 -07:00
Luca Bruno befef13d37 chaps: not supported on i686 (ZHF) 2015-07-22 11:37:38 +02:00
Dan Peebles 75a7f96b44 knockknock: minor cleanup 2015-07-22 01:32:09 +00:00
Dan Peebles a8c7abdb8d knockknock: init 
A simple but secure port knocking daemon and associated tool (NixOS modules upcoming)
 2015-07-22 01:26:40 +00:00
Austin Seipp 3793ff5290 nixpkgs: torsocks 2.0.0 -> 2.1.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 21:50:29 -05:00
Austin Seipp c2f1ac9885 nixpkgs: ssdeep 2.12 -> 2.13 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 13:52:34 -05:00
William A. Kennington III 8734f01830 sudo: 1.8.13 -> 1.8.14p1 2015-07-19 12:09:14 -07:00
Vladimír Čunát 9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Lluís Batlle i Rossell ce597e1e1b updating tor to 0.2.6.10 
I checked the tarball signature.

I fixed the optimised build (broken since 2013) and I added seccomp.
 2015-07-17 18:24:35 +02:00
Luca Bruno 60d19b3adc Revert "gnupg: fix build on darwin" 
This reverts commit db3602b5d6.

Fixed libusb build by 82d2960f15
 2015-07-16 10:36:29 +02:00
William A. Kennington III c8c11371b9 Merge pull request #8732 from lovek323/gnupg-darwin 
gnupg: fix build on darwin
 2015-07-15 17:37:59 -07:00
William A. Kennington III 25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
ts468 c930417537 Merge pull request #8830 from ts468/upstream.tpm-luks 
tpm-luks: update -> git-2015-07-11
 2015-07-15 10:52:20 +02:00
Thomas Strobel 127300a51d tpm-luks: update -> git-2015-07-11 2015-07-15 10:22:40 +02:00
William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Pascal Wittmann dc608ff237 sbsigntool: fix build (ZHF) 2015-07-12 23:41:10 +02:00
Pascal Wittmann 3c47a9980c crackxls: do not use march=native and mtune=native 
patch is from @dezgeg and is contained in #8530
 2015-07-11 12:23:21 +02:00
Jason "Don" O'Conal db3602b5d6 gnupg: fix build on darwin 2015-07-10 10:18:29 +10:00
William A. Kennington III ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
William A. Kennington III 9eae9dd811 gnupg: 2.0.27 -> 2.0.28 2015-07-06 17:14:01 -07:00
Arseniy Seroka 83083da5b1 Merge pull request #8651 from ts468/upstream.sbsigntool 
sbsigntool: init at 0.5
 2015-07-06 14:26:39 +03:00
William A. Kennington III fbfdc139d6 Merge branch 'master.upstream' into staging.upstream 2015-07-05 18:36:16 -07:00
William A. Kennington III fe705a664c gnupg: 2.1.5 -> 2.1.6 2015-07-05 16:51:03 -07:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Thomas Strobel c9e5218b33 sbsigntool: init at 0.5 2015-07-05 14:59:01 +02:00
Thomas Strobel 36f2ec82cc tmp-luks: init at 0.9pre 2015-07-04 23:57:59 +02:00
Thomas Strobel b73e917237 chaps: init at version 0.42-6812 
Chaps is a PKCS #11 implementation with TPM backend.
 2015-07-04 12:53:09 +02:00
Pascal Wittmann f0c00accd4 crackxls: fix build 2015-07-02 00:17:58 +02:00
William A. Kennington III 7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy 145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Pascal Wittmann 512225ef81 Fixed some descriptions 2015-06-29 16:20:58 +02:00
Jude Taylor 7e4f41b16f patch pinentry to work with ncurses 2015-06-25 16:36:05 -07:00
devhell ec31bead9f kpcli: 2.8 -> 3.0 2015-06-21 14:37:43 +01:00
William A. Kennington III fe03404ade Merge pull request #8382 from DamienCassou/update-pinentry-0.9.4 
pinentry: 0.9.1 -> 0.9.4
 2015-06-18 23:36:33 -07:00
William A. Kennington III 588d20ea39 opensc: 0.14.0 -> 0.15.0 2015-06-18 22:59:38 -07:00
Andrew Kelley 8925d17034 add myself as maintainer 2015-06-18 11:52:39 -07:00
lethalman af4c5f9cc4 Merge pull request #8249 from joachifm/clamav-milter 
clamav: build mail filter
 2015-06-18 14:47:17 +02:00
Damien Cassou e88de8308b pinentry: 0.9.1 -> 0.9.4 2015-06-18 14:11:55 +02:00
hiberno deadb4e0aa tor-browser: update 4.5.1 to 4.5.2, closes #8379 2015-06-18 11:25:32 +02:00
Tobias Geerinckx-Rice 98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Andrew Kelley bb2d249706 expose librhash 2015-06-17 03:01:26 -07:00
Shea Levy dbf1e0fb53 Merge branch 'update-gnupg-2.1.5' of https://github.com/DamienCassou/nixpkgs 2015-06-15 10:07:43 -04:00
Damien Cassou c2116191d3 gnupg 2.1.4 -> 2.1.5 
According to someone on #gnupg, the patch is not necessary anymore.
 2015-06-15 15:42:23 +02:00
Austin Seipp 1ee742b0ef nixpkgs: afl 1.80b -> 1.83b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-06-14 14:28:00 -05:00
Thomas Tuegel af6c270b6d pinentry: find moc when qt4 enabled 2015-06-13 10:12:13 -05:00
William A. Kennington III 84aad77f54 trousers: Add gcc5 compat 2015-06-12 15:40:48 -07:00
Chris Double 36a1d2d4f8 Update tor to 0.2.6.9 2015-06-12 12:49:41 +02:00
Pascal Wittmann 62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +02:00
Joachim Fasting 261dfad8a7 clamav: build mail filter 
Provides clamav-milter, a mail filter for sendmail compatible
MTAs.
 2015-06-07 14:36:13 +02:00
Arseniy Seroka 70b5e51456 Merge pull request #8178 from jagajaga/fix/versions 
fix: add missing versions
 2015-06-06 00:22:10 +03:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Tobias Geerinckx-Rice 860589227b eid-mw: don't install useless about-eid-mw.desktop 2015-06-04 20:31:05 +02:00
Eelco Dolstra 5d8fe045b6 Revert "Refactor mkFlag out of old packages" 
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
 2015-06-04 14:54:50 +02:00
Tobias Geerinckx-Rice a714ddcbd5 signing-party: Americanise licence -> license 2015-06-03 22:40:10 +02:00
Pascal Wittmann b55e54694e Merge pull request #7666 from qknight/clamav_security 
clamav: CVE-2015-2170 CVE-2015-2221 CVE-2015-2222 CVE-2015-2305 CVE-2015...
 2015-06-03 22:13:48 +02:00
Peter Simons e7f898a17c Merge pull request #8158 from DamienCassou/add-signing-party 
Add signing-party (aka., gpg-tools)
 2015-06-03 17:11:48 +02:00
Damien Cassou a4ac0caa52 Add signing-party (aka., gpg-tools) 2015-06-03 17:08:45 +02:00
lethalman f9c6921f0a Merge pull request #8128 from monocell/add-crackxls 
fix crackxls libgsf dependency and naming problem
 2015-06-02 15:02:28 +02:00
Emil Rangden 6eb4fdeb4d fix crackxls libgsf dependency 2015-06-02 13:21:53 +02:00
lethalman 3935379089 Merge pull request #8117 from monocell/add-crackxls 
new package: crackxls
 2015-06-01 18:51:58 +02:00
Emil Rangden ee8ac51986 add linux to platforms 2015-06-01 16:59:09 +02:00
Emil Rangden 10acbd6716 new package: crackxls 2015-06-01 16:15:19 +02:00
Emil Rangden 51bb5e85dc hashcat: fix build and update to 0.49 2015-06-01 15:58:07 +02:00
William A. Kennington III f99ec984d7 gnupg21: 2.1.3 -> 2.1.4 2015-05-31 13:55:18 -07:00
Cillian de Róiste 36985e8b5a aespipe: update from 2.4c to 2.4d 2015-05-31 13:12:39 +02:00
William A. Kennington III cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Austin Seipp 6fbc62419b nixpkgs: afl 1.67b -> 1.80b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-05-27 16:36:26 -05:00
Bjørn Forsman b217d9a4dd fail2ban: fix broken download/hash 
The (dynamically generated) compressed archive has changed. Switch from
fetchurl to fetchzip to not get bitten by that again.
 2015-05-24 20:31:52 +02:00
William A. Kennington III 1efd5f0fdf ccid: 1.4.18 -> 1.4.19 2015-05-24 01:53:14 -07:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
Chris Double 276bd7f16e Update tor to 0.2.6.8 2015-05-22 11:20:10 +12:00
Chris Double 609002cc94 Update tor-browser to 4.5.1 2015-05-19 14:52:52 +12:00
Chris Double 49d9476608 Update to tor 0.2.6.7 2015-05-19 14:19:15 +12:00
Eric Seidel 67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang 
Add isGNU and isClang attributes to cc-wrapper
 2015-05-14 10:09:07 -07:00
Moritz Ulrich 24d5eb262d Pass: Add pwgen to wrapper. 2015-05-12 23:38:28 +02:00
William A. Kennington III bd69c51ddf trousers: Fix darwin build 2015-05-11 15:58:17 -07:00
Eric Seidel 662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Vladimír Čunát f0746b846c gnutls: fixup 6b6183125 with multiple-output changes 2015-05-05 11:56:29 +02:00
Joachim Schiele 00cbf82c01 clamav: CVE-2015-2170 CVE-2015-2221 CVE-2015-2222 CVE-2015-2305 CVE-2015-2668 2015-05-03 02:28:13 +02:00
William A. Kennington III d5584b9698 opensc: Use libassuan2 2015-05-01 17:47:52 -07:00
William A. Kennington III 00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Chris Double d941d4c26e Update tor-browser to 4.5 2015-04-29 11:58:52 +12:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Luca Bruno 6b6183125e gnutls, trousers: fix .la and .pc files, remove propagated build inputs 
cc @vcunat @wkennington
 2015-04-25 11:43:08 +02:00
William A. Kennington III 610aad4cb8 trousers: Propagate openssl 2015-04-20 21:34:48 -07:00
Tobias Geerinckx-Rice 2454b943d7 eid-mw: fix and improve eid-nssdb helper script 
Now works. Good to know no-one else is using this :-)
 2015-04-20 17:17:39 +02:00
Pascal Wittmann 138de6b6e1 Merge pull request #7396 from cheecheeo/lastpass_update 
update lastpass-cli to version 0.5.1
 2015-04-16 14:18:27 +02:00
John Chee 88b9578189 update lastpass-cli to version 0.5.1 2015-04-15 08:56:27 -07:00
Moritz Ulrich 3fa9fe1dd1 Pass: Use default gpg(2) & use lib.makeSearchPath. 2015-04-15 10:45:43 +02:00
Austin Seipp 5cb0b0b28b nixpkgs: afl 1.64b -> 1.67b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-14 14:05:46 -05:00
William A. Kennington III 909f04995c gnupg: 2.1.2 -> 2.1.3 2015-04-13 18:03:01 -07:00
William A. Kennington III cf1d7a9cb4 pinentry: 0.9.0 -> 0.9.1 2015-04-13 18:03:01 -07:00
Austin Seipp 7200556e5d nixpkgs: afl - fix llvm-mode 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-11 22:00:54 -05:00
Austin Seipp 047e77274c nixpkgs: afl 1.63b -> 1.64b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-11 20:22:43 -05:00
Austin Seipp 600b7e5945 nixpkgs: afl 1.58b -> 1.63b 
- Adds new LLVM-based instrumentation support via afl-clang-fast.
  - Experimental support for cgroup management via afl-cgroup, to
    mitigate OOM issues when using afl with address sanitizer.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-11 15:26:31 -05:00
_1126 319d42941e tor-browser: bump to 4.0.8 2015-04-11 12:46:47 +02:00
Arseniy Seroka 3e079614ab Merge pull request #7258 from spwhitt/tor 
tor: fix for Darwin
 2015-04-08 13:17:14 +03:00
Spencer Whitt eab5ff59f6 tor: fix for Darwin 2015-04-08 01:42:13 -04:00
Domen Kožar 59d7189b21 Merge pull request #7253 from doublec/tor 
Update tor to 0.2.5.12
 2015-04-08 03:02:18 +02:00
Tobias Geerinckx-Rice 1926a7aa32 Tidy nckx-maintained packages 
- Use fetchFromGitHub when possible
- Build in parallel if supported
 2015-04-08 02:29:42 +02:00
Chris Double 6af23b3565 Update tor to 0.2.5.12 2015-04-08 11:52:46 +12:00
Spencer Whitt 3885fc5c3b fail2ban: include systemd on Linux only 2015-04-07 13:48:31 -04:00
_1126 64758a6429 tor-browser: bumps to 4.0.6 2015-04-07 15:37:57 +02:00
Tobias Geerinckx-Rice 0067ccbfdf Merge pull request #7129 from obadz/ecryptfs 
ecryptfs 104 -> 106
 2015-04-06 13:42:43 +02:00
obadz 8f7f2feb1d ecryptfs 104 -> 106 2015-04-05 23:55:01 +01:00
Austin Seipp 36db12ca31 nixpkgs: ssdeep 2.11 -> 2.12 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-02 16:27:52 -05:00
Jan Malakhovski 1ddc9e4be3 pass: rename withX into x11Support, cleanup a bit 2015-03-29 23:26:13 +00:00
Jan Malakhovski 6b9bb72319 gnupg: add x11Support option 2015-03-29 23:26:13 +00:00
Nikolay Amiantov cb7eeca147 fprintd: update 2015-03-29 13:05:28 +03:00
Petar Bogdanovic 273d31fff4 gnupg1orig: Remove left-over debug message. 
Patch committed by James Cook <james.cook@utoronto.ca>.
 2015-03-28 16:53:48 -07:00
Austin Seipp 5b0310ec59 nixpkgs: afl 1.57b -> 1.58b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-28 01:51:00 -05:00
William A. Kennington III 2f02ae037a sudo: 1.8.12 -> 1.8.13 2015-03-26 14:01:07 -07:00
Tobias Geerinckx-Rice d201dfc94c eid-mw 4.0.6-1620 -> 4.1.2 2015-03-26 19:47:19 +01:00
Domen Kožar 8feda47bee pinentry: fix build /cc wkennington 2015-03-26 10:07:05 +01:00
William A. Kennington III 70a8bfbcd5 pinentry: Fix for darwin 2015-03-25 16:19:02 -07:00
William A. Kennington III 79cfdb2afe pinentry: Slight refactoring 2015-03-25 16:10:00 -07:00
William A. Kennington III 4fc94e6222 pinentry: Update build 2015-03-25 16:09:00 -07:00
Chris Double 9369daf134 Update tor-browser to 4.0.5 2015-03-25 13:39:23 +13:00
Chris Double 9549f1c88f Update tor to 0.2.5.11 2015-03-25 13:39:23 +13:00
Austin Seipp a11078a78c nixpkgs: afl - add QEMU support 
This adds support for `afl-fuzz -Q`, which can be used to instrument
arbitrary black-box binary code for fuzz testing using American Fuzzy
Lop through QEMU emulation.

This requires a custom QEMU 2.2.0 build of the Linux userspace emulators
(system emulators aren't required) with some custom patches. Furthermore
we have to patch the patches a little to make the build more sane (there
are some notes in the README about this).

Overall, the addition of this feature by default doesn't significantly
impact build times (since building QEMU for only one target builds only
a fraction of the source code, and many features are disabled), so it's
enabled by default.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-22 22:52:57 -05:00
Austin Seipp 624fcfce64 nixpkgs: afl 1.56b -> 1.57b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-22 18:29:57 -05:00
Eric Seidel 51d465646a gnupg: don't demand pcsclite on darwin 2015-03-21 09:14:36 -07:00
Eelco Dolstra 2ed5c2bd6b Set some meta.platforms 
Also fix meta.platform -> meta.platforms in a few places.
 2015-03-20 20:04:42 +01:00
Vladimír Čunát 80c7a6f107 nmap: extend platforms 
Tested briefly by @jcf on darwin, web site claims BSDs are also supported.
 2015-03-18 23:51:19 +01:00
Eric Seidel fd60b5f496 gnupg: dont demand pcsclite on darwin 2015-03-17 17:26:01 -07:00
devhell 6a8a739d68 gnupg21: Add texinfo as a dependency 
This adds texinfo as a dependency, without which the build will fail.
 2015-03-16 00:32:16 +00:00
_1126 f1f3c2c775 torbrowser: bump version to 4.0.4 2015-03-14 14:36:25 +01:00
Edward Tjörnhammar ec77aca091 srm: 1.2.14 -> 1.2.15 2015-03-11 19:22:25 +01:00
Austin Seipp ed75d612d6 nixpkgs: afl 1.49b -> 1.56b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-10 01:19:51 -05:00
William A. Kennington III e1703a836e gnupg: 2.0.26 -> 2.0.27 2015-03-09 15:22:59 -07:00
William A. Kennington III 9631f5a718 gnupg: Fix default path to pcsclite 2015-03-09 15:22:59 -07:00
Peter Simons 97feb65c00 pcsctools: fix evaluation 2015-03-09 16:02:48 +01:00
Lluís Batlle i Rossell a2f4b94dbe Add pcsc-tools, to test ccid cards. 2015-03-09 15:37:50 +01:00
obadz fcd5d8fdc6 ecryptfs: lib.maintainers vs maintainers 2015-03-08 16:03:52 -07:00
obadz e5d4624420 PAM/eCryptfs now able to mount ecryptfs'd home directories on login 2015-03-08 16:03:51 -07:00
Petar Bogdanovic 31955c869f Update gnupg1orig package to gpg-1.4.19 
A test build pulled too many packages (including perl) for my VM so
while it's a simple bump, it's also untested.
 2015-03-05 16:04:29 +01:00
William A. Kennington III 919894f4fe opensc: Fix pcsclite reference 2015-03-03 14:52:02 -08:00
William A. Kennington III 4db81f081b opensc: 0.13.0 -> 0.14.0 2015-03-03 14:27:49 -08:00
Austin Seipp 0d266b2392 nixpkgs: afl 1.21b -> 1.49b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-02-25 07:54:15 -06:00
Eelco Dolstra 9e9e446880 sudo: Fix incorrect runtime path 2015-02-25 12:39:06 +01:00
Eelco Dolstra 3d3db3550f sudo: Update to 1.8.12 2015-02-24 18:04:35 +01:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05:00
Shea Levy df0016a8ce Fix pass on darwin 2015-02-15 16:14:13 +00:00
Peter Simons 600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons 6827c7d8b0 Merge pull request #6315 from matthiasbeyer/update-gnupg 
Update gnupg21 package to gpg-2.1.2
 2015-02-12 18:58:06 +01:00
Matthias Beyer 91c31bcc57 Update gnupg21 package to gpg-2.1.2 2015-02-12 16:52:07 +01:00
Shea Levy 52879c9050 pass: fix completion installation 2015-02-11 15:29:34 +00:00
j-keck dc9cdb2beb kpcli: 2.7 -> 2.8 2015-02-09 09:17:33 +01:00
Eric Seidel e08b9ab8d3 kill libiconvOr* 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-07 20:29:28 -08:00
Moritz Ulrich 6a24650cb5 pass: update from 1.6.3 to 1.6.5 2015-02-07 18:49:49 +01:00
lethalman 0e987968e5 Merge pull request #6198 from joachifm/update-clamav 
clamav: bump to version 0.98.6
 2015-02-06 10:37:41 +01:00
Joachim Fasting 37649e76e3 clamav: bump to version 0.98.6 2015-02-06 08:56:38 +01:00
Moritz Ulrich a5807eb7c4 pass: default to withX = true & install passmenu. 2015-02-04 12:06:48 +01:00
Nikolay Amiantov 0867c43294 fprintd: update package 2015-02-03 14:27:49 +03:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Benno Fünfstück 0b9af69347 kpcli: XMLParser is required for KeePass2 format 2015-01-25 22:10:10 +01:00
Markus Kohlhase 8295846f6f nixpkgs: torbrowser 4.0.2 -> 4.0.3 2015-01-25 09:03:19 +00:00
Edward Tjörnhammar a83cfbfc7c Merge pull request #5541 from nckx/eid-viewer-association 
eid-viewer: associate with XML & text/plain (MIME type of .eid files)
 2015-01-24 23:31:24 +01:00
Austin Seipp 7581c422d4 nixpkgs: afl 1.06b -> 1.21b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-01-23 10:46:10 -06:00
Tobias Geerinckx-Rice 0fd09d1165 eid-{mw,viewer}: run tests 
Not doing so in this case seems downright irresponsible.
 2015-01-20 07:26:48 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Pascal Wittmann 56e3d5d99e Merge pull request #5742 from j-keck/kpcli 
add kpcli: KeePass Command Line Interface
 2015-01-14 14:28:06 +01:00
j-keck 4e21ef88fb add kpcli: KeePass Command Line Interface 2015-01-14 14:12:29 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Tobias Geerinckx-Rice 6565714873 eid-viewer: associate with XML & plain text .eid files 
The .eid files are in fact XML, but lack the <?xml...?> declaration that
file(1) seems to expect. At least the viewer now appears as an option in
most GUIs.
 2015-01-13 21:10:49 +01:00
lethalman 908c47b281 Merge pull request #5550 from abbradar/fprintd 
add fprintd support
 2015-01-08 14:58:22 +01:00
Nikolay Amiantov 006dceba14 fprint_demo: add package 2015-01-03 19:50:40 +03:00
Nikolay Amiantov 63af25130e fprintd: add package 2015-01-03 19:50:40 +03:00
John Wiegley a00a8d0711 gnupg: correct a typo in their source code 2015-01-03 07:53:09 -05:00
William A. Kennington III afeef240dc kerberos: Use default kerberos instead of krb5 2014-12-30 00:05:12 -08:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Austin Seipp c619e54e60 nmap: fix dependencies on makeWrapper/python 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-29 12:55:14 -06:00
Austin Seipp 2cabafd363 nixpkgs: afl-1.04b -> 1.06b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-28 23:45:25 -06:00
Austin Seipp bf5935e34c nixpkgs: p0f 3.07b -> 3.08b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-28 23:43:34 -06:00
Austin Seipp baa2e7326f nixpkgs: nmap 6.40 -> 6.47 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-28 23:41:54 -06:00
Austin Seipp 79f82686e1 nixpkgs: afl 0.89b -> 1.04b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-26 21:43:05 -06:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Karn Kallio 23010cf71a gnupg: Port socket activation patch to version 2.1.1. 2014-12-24 19:16:38 +01:00
William A. Kennington III 86971fd33b gnupg: Fix src hash 2014-12-18 11:37:58 -08:00
Eelco Dolstra 6866712a39 sudo: Update to 1.8.11p2 2014-12-18 12:31:56 +01:00
William A. Kennington III 56908ab49f pinentry: 0.8.4 -> 0.9.0 2014-12-16 15:30:16 -08:00
William A. Kennington III b671a46f92 gnupg: 2.1.0 -> 2.1.1 2014-12-16 15:24:28 -08:00
Jaka Hudoklin 1465d9321d thc-hydra: include postgresql brute-force support 2014-12-11 23:25:26 +01:00
Jaka Hudoklin 3ceb789c36 john: use systemd wide config, and not from store 2014-12-11 23:25:26 +01:00
Austin Seipp 5c52382448 tor-arm: kill tabs 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 04:21:14 -06:00
Austin Seipp 7a51e5f416 nixpkgs: fix tor-arm dependencies 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 04:14:11 -06:00
Austin Seipp 0d63eae992 tor-arm: Fix python path 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 04:06:02 -06:00
Austin Seipp b31283dd8b nixpkgs: add tor-arm 1.4.5.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 03:59:59 -06:00
Domen Kožar 0ec12d53e6 tcpcrypt: 2011.07.22 -> 0.3rc1, fix nixos service 2014-12-10 10:23:46 +01:00
Austin Seipp 323113ef6d nixpkgs: afl 0.85b -> 0.89b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-09 21:59:28 -06:00
wmertens 24924e4fdf Merge pull request #5125 from nckx/eid-mw 
Add eid-mw: authenticate & sign with Belgian eID identity cards
 2014-12-08 16:40:54 +01:00
Domen Kožar de99c9c955 Merge branch 'staging' 2014-12-08 16:28:45 +01:00
Edward Tjörnhammar 3ce89ba002 srm: added package 2014-12-08 11:51:39 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Austin Seipp c3bdbd3b52 nixpkgs: tor-browser 4.0.1 -> 4.0.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:01:28 -06:00
Austin Seipp 92eb86e110 nixpkgs: add myself as a 'tor' maintainer 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:01:27 -06:00
Austin Seipp c206c728a8 nixpkgs: tor depends on torsocks 
This may seem strange, but tor distributes its 'torify' wrapper which in
turn attempts to use torsocks to bridge a connection, meaning 'tor'
users out the box may want it to work.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:00:27 -06:00
Austin Seipp d92d0eca92 nixpkgs: torsocks 1.3 -> 2.0.0 
Additionally, this fixes 'torsocks' using the 'which' executable as a
dependency.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:00:26 -06:00
Tobias Geerinckx-Rice b7425f8fef Add eid-mw: authenticate & sign with Belgian eID identity cards 2014-12-05 23:15:44 +01:00
Charles Strahan aadb556e29 lastpass-cli: new package 
This adds the official lastpass CLI, a utility for manipulating lastpass logins.
 2014-12-04 18:23:25 -05:00
Austin Seipp 25d883a46d nixpkgs: afl 0.79b -> 0.85b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-03 18:53:20 -06:00
Austin Seipp 8f6279be5c afl: 0.68b -> 0.79b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-11-30 13:19:26 -06:00
Vladimír Čunát b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Austin Seipp 57ec90f90f nixpkgs: Fuzzing test case optimizer 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-11-25 13:03:43 -06:00
Austin Seipp b0dc5b17ca nixpkgs: American Fuzzy Lop 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-11-25 12:43:03 -06:00
Vladimír Čunát a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Tobias Geerinckx-Rice d72f6c85e4 Add eid-viewer: Java reader for Belgian eID identity cards 2014-11-23 00:42:52 +01:00
vbgl a4a235c0d0 Merge pull request #5082 from robberer/pkgs/clamav 
clamav: bump 0.98.4 to 0.98.5
 2014-11-22 10:35:21 +00:00
Longrin Wischnewski a8bce0cf73 clamav: bump 0.98.4 to 0.98.5 2014-11-22 09:50:41 +01:00
vbgl 3e8fd1b30b Merge pull request #5014 from doublec/tor 
Update Tor to 0.2.5.10.
 2014-11-21 07:33:53 +00:00
Thomas Tuegel dfaa39db41 polkit-qt-1: Qt 5 support 
polkit-qt-1 is upgraded to the latest version, which supports Qt 5. The
attributes are also renamed to differentiate the Qt 4 and Qt 5
branches. The prior naming scheme differentiated between polkit-qt-1 and
polkit-qt, but we no longer package the latter.
 2014-11-20 11:10:39 -06:00
Shea Levy 25b4674e67 gnupg-2.1: Add socket activation patch 2014-11-18 16:58:14 -05:00
Chris Double 32d09e2699 Update Tor Browser to 4.0.1 
Updates Tor Browser to 4.0.1. This requires the gcc 4.9 runtime.

Add myself to the maintainers.
 2014-11-18 23:46:42 +13:00
Chris Double 75425ff879 Update Tor to 0.2.5.10. 
Updates Tor to latest stable version.

Add myself to the maintainer list.
 2014-11-18 01:47:42 +13:00
Thomas Hunger 41d89224c9 Update fail2ban to 0.9.1. 
Version 0.9 is no longer available for downloat at github.
 2014-11-15 16:54:40 +00:00
William A. Kennington III 6fbb5711f5 pcsclite: 1.8.12 -> 1.8.13 2014-11-14 22:22:12 -08:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Boris Sukholitko 1e8e9b9398 volatility: upgrade to 2.4 2014-11-12 22:35:42 +02:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
William A. Kennington III 850da1803f gnupg: Add gnupg 2.1 as default 
Additionally, move all gnupg expressions into the gnupg folder.
 2014-11-06 11:44:12 -08:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Evgeny Egorochkin ac8c944332 add myself as a maintainer 2014-11-05 11:35:32 +02:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
Rob Vermaas c9d40dc6f8 oathToolkit: update from 2.0.2 to 2.4.1, potentially fixes CVE-2013-4204, CVE-2013-6280, CVE-2013-7322 2014-11-04 10:22:46 +01:00
Vladimír Čunát ed867a50eb iconv: remove usage on Linux in several packages 
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
 2014-11-03 12:58:54 +01:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Evgeny Egorochkin eb8f380f4e pwgen: update from 2.06 to 2.07 2014-11-01 14:52:11 +02:00
Emery Hemingway 6b7eda4ddc mbox does not support i686 2014-10-31 11:48:55 -04:00
William A. Kennington III 4e8d55c59f pinentry: 0.8.3 -> 0.8.4 2014-10-29 02:05:17 -07:00
Emery Hemingway 358acd7d52 mbox: initial package 
http://pdos.csail.mit.edu/mbox
 2014-10-28 12:43:51 -04:00
Evgeny Egorochkin a6dc9ce957 tor: update from 0.2.4.23 to 0.2.4.24 2014-10-25 20:31:54 +03:00
cillianderoiste 5c6ae9c6d3 Merge pull request #4623 from abbradar/rng-tools 
rng-tools: update package
 2014-10-23 19:35:08 +02:00
Mateusz Kowalczyk 342e7748e2 Merge pull request #4624 from abbradar/wipe 
wipe: add package
 2014-10-23 11:50:12 +01:00
Mateusz Kowalczyk f5c9daf99e Merge pull request #4530 from ts468/simple-tpm 
Add package: simple-tpm-pk11
 2014-10-23 11:47:44 +01:00
Mateusz Kowalczyk 0e840902ff Merge pull request #4629 from ts468/aide 
New package: AIDE, version 0.16a2
 2014-10-23 11:47:22 +01:00
Mateusz Kowalczyk d5385034be Merge pull request #4508 from ts468/opencryptoki 
Add package: opencryptoki
 2014-10-23 11:46:33 +01:00
Thomas Strobel c89c3649d2 New package: AIDE, version 0.16a2 
Advanced Intrusion Detection Environment (AIDE) is a file and directory integrity checker
 2014-10-23 01:29:14 +02:00
Nikolay Amiantov 0f2af778b7 wipe: add package 2014-10-23 02:08:37 +04:00
Nikolay Amiantov 9fa041e3e6 rng-tools: update package 2014-10-23 02:07:46 +04:00
Thomas Strobel 49fd0c32ff Add package: simple-tpm-pk11 
Simple PKCS11 provider for TPM chips
 2014-10-15 01:14:34 +02:00
Thomas Strobel d206122ade Add package: opencryptoki 
Make tpm-tools depend on opencryptoki as well.
 2014-10-14 09:03:50 +02:00
Thomas Strobel 0dd66a50de Update: trousers 0.3.11 -> 0.3.13 2014-10-14 09:00:31 +02:00
Peter Simons fb30eb932b thc-hydra: fix download url 2014-10-13 15:58:27 +02:00
Peter Simons 525a850511 thc-hydra: don't call this package "hydra"; that name is taken in NixOS 2014-10-12 17:34:49 +02:00
Austin Seipp 9b391aadce ssdeep: 2.10 -> 2.11 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-10-09 17:06:17 -05:00
Austin Seipp 5c805fe266 p0f: 3.06b -> 3.07b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-10-09 17:00:25 -05:00