monkeysphere.git
13 years agoupdate changelog for 0.34-1 release monkeysphere_0.34-1
Jameson Rollins [Tue, 26 Oct 2010 14:35:56 +0000 (10:35 -0400)]
update changelog for 0.34-1 release

13 years agoMerge branch 'master' into debian
Jameson Rollins [Tue, 26 Oct 2010 14:30:47 +0000 (10:30 -0400)]
Merge branch 'master' into debian

13 years agofinalize changelog for 0.34 release monkeysphere_0.34
Jameson Rollins [Tue, 26 Oct 2010 14:27:58 +0000 (10:27 -0400)]
finalize changelog for 0.34 release

13 years agoadd note about CHECK_KEYSERVER var in msph-auth man page
Jameson Rollins [Tue, 26 Oct 2010 14:26:20 +0000 (10:26 -0400)]
add note about CHECK_KEYSERVER var in msph-auth man page

13 years agoensure that we only remove fully-matching lines once we have found them
Daniel Kahn Gillmor [Mon, 25 Oct 2010 20:20:23 +0000 (16:20 -0400)]
ensure that we only remove fully-matching lines once we have found them

13 years agoback to using grep fixed-string matching when removing key lines
Jameson Rollins [Sun, 24 Oct 2010 15:51:39 +0000 (11:51 -0400)]
back to using grep fixed-string matching when removing key lines

This method uses grep -F to find the full line to match, and then
second call to grep -v -F to actually remove the line.  For
known_hosts, we use two piped grep -F calls.  No rexexp are used, and
only one extra call to grep is required for known_hosts line removal.

There is still an issue here about sub-string matches, but there is at
least no regression over early versions.

13 years agodon't fail if authorized_keys file not present
Jameson Rollins [Fri, 22 Oct 2010 20:25:04 +0000 (16:25 -0400)]
don't fail if authorized_keys file not present

we create a new function here, touch_key_file_or_fail, which will
touch a new key file if there isn't one already present.  This is now
used in the update_authorized_keys and update_known_hosts functions
when looking for authorized_keys and known_hosts respectively.

Closes Debian 600644

13 years agotweak log levels and messages in ma/update_users
Jameson Rollins [Fri, 22 Oct 2010 20:22:09 +0000 (16:22 -0400)]
tweak log levels and messages in ma/update_users

13 years agofix remove_line function to not use fixed string checking, and to mv -f the tmp file...
Jameson Rollins [Tue, 19 Oct 2010 04:00:17 +0000 (00:00 -0400)]
fix remove_line function to not use fixed string checking, and to mv -f the tmp file into place

13 years agofix remove_monkeysphere_lines function to just read from stdin and write to stdout
Jameson Rollins [Tue, 19 Oct 2010 03:34:06 +0000 (23:34 -0400)]
fix remove_monkeysphere_lines function to just read from stdin and write to stdout

13 years agofix update_known_hosts to create proper initial temp file
Jameson Rollins [Tue, 19 Oct 2010 03:32:21 +0000 (23:32 -0400)]
fix update_known_hosts to create proper initial temp file

13 years agofix back to integer indexing in process_authorized_user_ids
Jameson Rollins [Tue, 19 Oct 2010 02:23:04 +0000 (22:23 -0400)]
fix back to integer indexing in process_authorized_user_ids

13 years agocleanup update_known_hosts
Jameson Rollins [Mon, 18 Oct 2010 22:21:55 +0000 (18:21 -0400)]
cleanup update_known_hosts

* don't update if unchanged
* proper trap setting
* cleanup comments

13 years agofix up update_authorized_keys
Jameson Rollins [Mon, 18 Oct 2010 22:18:09 +0000 (18:18 -0400)]
fix up update_authorized_keys

* better trap handling
* don't update file if unchanged
* clean up comments

13 years agofix process_keys_for_file so that it can accept '-' as a file, and send output to...
Jameson Rollins [Mon, 18 Oct 2010 22:12:45 +0000 (18:12 -0400)]
fix process_keys_for_file so that it can accept '-' as a file, and send output to stdout.

13 years agoupdate changelog
Jameson Rollins [Mon, 18 Oct 2010 20:36:11 +0000 (16:36 -0400)]
update changelog

13 years agoSimplification/refactoring of key/file processing
Jameson Rollins [Mon, 18 Oct 2010 13:55:53 +0000 (09:55 -0400)]
Simplification/refactoring of key/file processing

This is a fairly major overhaul to greatly reduce the number of
redundant code paths.  We here created a new process_keys_for_file
function that processes key from a userid for a given key file.  All
the main top elevel functions now call this one function.

The main top level monkeysphere functions for updating the user's
authorized_keys and known_hosts files are now moved to their own
sourced files, which greatly reduces the amount of code sourced with
common.

monkeysphere now updates authorized_keys and known_hosts in temporary
files that are then atomically moved into place upon completion.

Finally, removed the confusing return codes in the key/file processing
functions that were based on number of valid/invalid keys processed.
It was confusing in the presence of actual errors that stopped
processing.

13 years agofix test for keys-for-user
Jameson Rollins [Mon, 18 Oct 2010 05:49:58 +0000 (01:49 -0400)]
fix test for keys-for-user

13 years agomake dependencies on gnupg versioned on 1.4.10 or higher, because of keytrans test...
Daniel Kahn Gillmor [Mon, 18 Oct 2010 16:58:56 +0000 (12:58 -0400)]
make dependencies on gnupg versioned on 1.4.10 or higher, because of keytrans test suite failure (MS #2549)

13 years agoadd check for argument in keys-for-user
Jameson Rollins [Mon, 18 Oct 2010 05:34:20 +0000 (01:34 -0400)]
add check for argument in keys-for-user

13 years agofixed bug in remove_monkeysphere_lines function
Jameson Rollins [Mon, 18 Oct 2010 01:40:35 +0000 (21:40 -0400)]
fixed bug in remove_monkeysphere_lines function

it was matching MonkeySphere strings as full lines and therefore not
actually removing monkeysphere lines.

I'm not sure exactly why, upon further consideration, why we actually
need to be removing all monkeysphere lines in update_authorized_keys.

13 years agofix changelog
Jameson Rollins [Sun, 17 Oct 2010 23:31:05 +0000 (19:31 -0400)]
fix changelog

13 years agoremove unneccessary export of TMP_AUTHORIZED_USER_IDS
Jameson Rollins [Sun, 17 Oct 2010 23:20:29 +0000 (19:20 -0400)]
remove unneccessary export of TMP_AUTHORIZED_USER_IDS

13 years agofix keys-for-user
Jameson Rollins [Sun, 17 Oct 2010 23:14:31 +0000 (19:14 -0400)]
fix keys-for-user

This function now properly outputs to stdout exactly what would have
been written to the monkeysphere-controlled authorized_keys file, but
without actually touching it.

13 years agoadd missing CHECK_KEYSERVER config in skeleton monkeysphere-authentication.conf
Jameson Rollins [Sat, 16 Oct 2010 03:32:43 +0000 (23:32 -0400)]
add missing CHECK_KEYSERVER config in skeleton monkeysphere-authentication.conf

13 years agoadd 'k' as shortcut for keys-for-user
Jameson Rollins [Sat, 16 Oct 2010 03:32:10 +0000 (23:32 -0400)]
add 'k' as shortcut for keys-for-user

13 years agofix typo in monkeysphere usage
Jameson Rollins [Sat, 16 Oct 2010 03:31:47 +0000 (23:31 -0400)]
fix typo in monkeysphere usage

13 years agonote bts closes in debian changelog monkeysphere_0.33-1
Jameson Rollins [Fri, 15 Oct 2010 22:16:23 +0000 (18:16 -0400)]
note bts closes in debian changelog

13 years agoupdate debian changelog in prep for release
Jameson Rollins [Fri, 15 Oct 2010 22:13:21 +0000 (18:13 -0400)]
update debian changelog in prep for release

13 years agoMerge branch 'master' into debian
Jameson Rollins [Fri, 15 Oct 2010 22:05:53 +0000 (18:05 -0400)]
Merge branch 'master' into debian

13 years agoupdate changelog for 0.33 release monkeysphere_0.33
Jameson Rollins [Fri, 15 Oct 2010 22:05:37 +0000 (18:05 -0400)]
update changelog for 0.33 release

13 years agomake sure authorized_keys options lines are skipped in keys-for-user
Jameson Rollins [Fri, 15 Oct 2010 20:47:21 +0000 (16:47 -0400)]
make sure authorized_keys options lines are skipped in keys-for-user

13 years agoattempt to fix apostroproblem in ma/keys-for-user
Jameson Rollins [Fri, 15 Oct 2010 19:38:10 +0000 (15:38 -0400)]
attempt to fix apostroproblem in ma/keys-for-user

This is an attempt to fix #600304 by properly passing the string
litteral in to be processed, instead of escaping problematic
characters.

13 years agoavoid keytrans test suite breakage on fast processors (addresses http://bugs.debian...
Daniel Kahn Gillmor [Fri, 15 Oct 2010 17:34:09 +0000 (13:34 -0400)]
avoid keytrans test suite breakage on fast processors (addresses bugs.debian.org/591118)

13 years agodefault HASH_KNOWN_HOSTS to false (closes MS #2483)
Daniel Kahn Gillmor [Fri, 8 Oct 2010 20:15:33 +0000 (16:15 -0400)]
default HASH_KNOWN_HOSTS to false (closes MS #2483)

13 years agoremoved releasenote details, as they are now in monkeysphere-docs
Daniel Kahn Gillmor [Thu, 7 Oct 2010 06:49:56 +0000 (02:49 -0400)]
removed releasenote details, as they are now in monkeysphere-docs

13 years agoupdate standards version to 3.9.1 monkeysphere_0.32-1
Jameson Rollins [Wed, 6 Oct 2010 21:52:24 +0000 (17:52 -0400)]
update standards version to 3.9.1

13 years agoupdate debian/changelog date to account for most recent merge from master
Jameson Rollins [Wed, 6 Oct 2010 21:42:46 +0000 (17:42 -0400)]
update debian/changelog date to account for most recent merge from master

13 years agoMerge branch 'master' into debian
Jameson Rollins [Wed, 6 Oct 2010 21:41:47 +0000 (17:41 -0400)]
Merge branch 'master' into debian

13 years agoFix more calls to gpg_shere, finishing what was started in 90166e0bb8e4ebc1c1174d9bc2... monkeysphere_0.32
Jameson Rollins [Wed, 6 Oct 2010 21:37:54 +0000 (17:37 -0400)]
Fix more calls to gpg_shere, finishing what was started in 90166e0bb8e4ebc1c1174d9bc2021c604b7a1bd7

There were another calls to gpg_sphere that were packing everything
into a single argument.  Since we fixed the need to do that, we fix
all these other calls that were fixed in the first round.

13 years agofix release target for experimental, not unstable
Jameson Rollins [Mon, 4 Oct 2010 06:21:49 +0000 (02:21 -0400)]
fix release target for experimental, not unstable

13 years agoremove X11 session initialization script. ready for 0.32 release
Jameson Rollins [Mon, 4 Oct 2010 06:17:46 +0000 (02:17 -0400)]
remove  X11 session initialization script.  ready for 0.32 release

13 years agoMerge branch 'master' into debian
Jameson Rollins [Mon, 4 Oct 2010 06:17:02 +0000 (02:17 -0400)]
Merge branch 'master' into debian

13 years agoupdate changelog for 0.32 release
Jameson Rollins [Mon, 4 Oct 2010 06:16:38 +0000 (02:16 -0400)]
update changelog for 0.32 release

13 years agouse LC_ALL=C for all gpg calls
Jameson Rollins [Mon, 4 Oct 2010 05:49:47 +0000 (01:49 -0400)]
use LC_ALL=C for all gpg calls

This should help with internationalization differences in gpg that
could cause problems.  Works in tests as is, but haven't tested with
odd locales.

13 years agoMerge remote branch 'greg/2459'
Jameson Rollins [Mon, 4 Oct 2010 05:25:46 +0000 (01:25 -0400)]
Merge remote branch 'greg/2459'

13 years agofix need for only single argument to gpg_sphere
Jameson Rollins [Mon, 4 Oct 2010 04:37:29 +0000 (00:37 -0400)]
fix need for only single argument to gpg_sphere

The use of $* instead of $@ in the call to su_monkeysphere_user is
what we want to not split the input to the bash subcalls into separate
words.

13 years agoTest coverage for monkeysphere-authentication keys-for-user
Greg Lyle [Sat, 2 Oct 2010 20:10:09 +0000 (16:10 -0400)]
Test coverage for monkeysphere-authentication keys-for-user

13 years agoupdate Changelog
Daniel Kahn Gillmor [Sun, 3 Oct 2010 04:23:24 +0000 (00:23 -0400)]
update Changelog

13 years agoMerge remote branch 'jrollins/master'
Daniel Kahn Gillmor [Sun, 3 Oct 2010 04:18:24 +0000 (00:18 -0400)]
Merge remote branch 'jrollins/master'

13 years agofix formatting of b3f0bbedbf242d2640d3bc56cce62ae726081400 to conform to standard
Jameson Rollins [Sat, 2 Oct 2010 20:13:12 +0000 (16:13 -0400)]
fix formatting of b3f0bbedbf242d2640d3bc56cce62ae726081400 to conform to standard

13 years agoadd debugging to monkeysphere-host publish-key, closes: #2289
Micah Anderson [Sat, 2 Oct 2010 19:06:16 +0000 (15:06 -0400)]
add debugging to monkeysphere-host publish-key, closes: #2289

13 years agossh authorized_keys options test
Clint Adams [Sat, 2 Oct 2010 19:06:54 +0000 (15:06 -0400)]
ssh authorized_keys options test

13 years agoMake remote execution command a parameter to ssh_test
Clint Adams [Sat, 2 Oct 2010 18:53:29 +0000 (14:53 -0400)]
Make remote execution command a parameter to ssh_test

13 years agoMinimal documentation of ssh authorized_keys options specification.
Clint Adams [Sat, 2 Oct 2010 18:39:01 +0000 (14:39 -0400)]
Minimal documentation of ssh authorized_keys options specification.

13 years agoAssume that space- or tab-prefixed lines contain ssh authorized_keys options applicab...
Clint Adams [Sat, 2 Oct 2010 18:10:59 +0000 (14:10 -0400)]
Assume that space- or tab-prefixed lines contain ssh authorized_keys options applicable to the preceding user ID.

13 years agoadded changelog note of fix for monkeysphere-host from micah
Daniel Kahn Gillmor [Fri, 1 Oct 2010 14:45:21 +0000 (10:45 -0400)]
added changelog note of fix for monkeysphere-host from micah

13 years agofix revoke_key typo in creating temporary directory
Micah Anderson [Fri, 1 Oct 2010 14:07:46 +0000 (10:07 -0400)]
fix revoke_key typo in creating temporary directory
fix variable specifying which key to revoke

monkeysphere-host revoke-key <key-id> would produce the following errors, this
commit fixes that:

Really publish this cert to zimmermann.mayfirst.org ? (Y/n) y
/usr/share/monkeysphere/mh/revoke_key: line 96: mkmstempdir: command not found
gpg: new configuration file `/root/.gnupg/gpg.conf' created
gpg: WARNING: options in `/root/.gnupg/gpg.conf' are not yet active during this run
gpg: "0x!" not a key ID: skipping

13 years agoMerge remote branch 'jamie/master'
Daniel Kahn Gillmor [Tue, 21 Sep 2010 14:55:18 +0000 (10:55 -0400)]
Merge remote branch 'jamie/master'

13 years agochange log level for outputting message: "! primary key could not be
Jamie McClelland [Tue, 21 Sep 2010 14:34:03 +0000 (10:34 -0400)]
change log level for outputting message: "! primary key could not be
translated (not RSA?)." from "error" to "verbose"

13 years agoforce link making when installing, for idempotence
Jameson Rollins [Tue, 14 Sep 2010 17:36:14 +0000 (13:36 -0400)]
force link making when installing, for idempotence

13 years agofix *all* install paths, including in man pages and transition scripts
Jameson Rollins [Tue, 14 Sep 2010 17:35:28 +0000 (13:35 -0400)]
fix *all* install paths, including in man pages and transition scripts

13 years agofix install target to not add DESTDIR to installed prefix
Jameson Rollins [Tue, 14 Sep 2010 17:01:05 +0000 (13:01 -0400)]
fix install target to not add DESTDIR to installed prefix

13 years agofix specification of install directories in top level scripts.
Jameson Rollins [Tue, 14 Sep 2010 16:26:58 +0000 (12:26 -0400)]
fix specification of install directories in top level scripts.

Various install paths were hard coded in the top level scripts.  This
was causing problems for non-standard install locations.  Also added
use of LOCALSTATEDIR variable to specify /var/lib path.

13 years agoremoving freebsd packaging since it is on its own branch
Daniel Kahn Gillmor [Mon, 13 Sep 2010 19:53:11 +0000 (15:53 -0400)]
removing freebsd packaging since it is on its own branch

13 years agofix up notes about how to prepare a release
Daniel Kahn Gillmor [Tue, 10 Aug 2010 18:10:31 +0000 (14:10 -0400)]
fix up notes about how to prepare a release

13 years agotest for presence of config files before sourcing them (works with both dash and...
Daniel Kahn Gillmor [Tue, 10 Aug 2010 18:05:33 +0000 (14:05 -0400)]
test for presence of config files before sourcing them (works with both dash and bash, and resolves MS #2471)

13 years agoupdating Standards-Version to 3.9.0 monkeysphere_0.31-1
Daniel Kahn Gillmor [Fri, 16 Jul 2010 13:05:57 +0000 (09:05 -0400)]
updating Standards-Version to 3.9.0

13 years agopreparing for 0.31-1 release
Daniel Kahn Gillmor [Thu, 15 Jul 2010 23:22:40 +0000 (19:22 -0400)]
preparing for 0.31-1 release

13 years agoMerge branch 'master' into HEAD
Daniel Kahn Gillmor [Thu, 15 Jul 2010 23:21:48 +0000 (19:21 -0400)]
Merge branch 'master' into HEAD

13 years agopreparing for 0.31 release monkeysphere_0.31
Daniel Kahn Gillmor [Thu, 15 Jul 2010 23:21:23 +0000 (19:21 -0400)]
preparing for 0.31 release

13 years agoadded some examples for system integration
Daniel Kahn Gillmor [Thu, 15 Jul 2010 21:02:08 +0000 (17:02 -0400)]
added some examples for system integration

13 years agoupdate changelog about new keys-for-user monkeysphere-authentication subcommand
Jameson Rollins [Sun, 4 Jul 2010 04:19:21 +0000 (00:19 -0400)]
update changelog about new keys-for-user monkeysphere-authentication subcommand

13 years agoMerge remote branch 'dkg/master'
Jameson Rollins [Sun, 4 Jul 2010 04:16:26 +0000 (00:16 -0400)]
Merge remote branch 'dkg/master'

13 years agofix debug message in checkperms
Jameson Rollins [Sun, 4 Jul 2010 04:15:02 +0000 (00:15 -0400)]
fix debug message in checkperms

13 years agosmall tweak to monkeysphere man page
Jameson Rollins [Sun, 4 Jul 2010 04:14:45 +0000 (00:14 -0400)]
small tweak to monkeysphere man page

13 years agoadd keys-for-user subcommand to monkeysphere-authentication
Jameson Rollins [Sun, 4 Jul 2010 04:06:35 +0000 (00:06 -0400)]
add keys-for-user subcommand to monkeysphere-authentication

This subcommand will output all valid key for a given user.  The
user's authorized_user_ids file will be read for OpenPGP user IDs, one
per line.  The ssh-formated RSA keys will be output to stdout.

Also included is a simple script that takes the user as it's one
argument and exec's this command.  This is something that would be
suitable for the proposed sshd AuthorizedKeysCommand.

13 years agoupdate Xsession.d script to avoid choking when /etc/monkeysphere/monkeysphere.conf...
Daniel Kahn Gillmor [Tue, 15 Jun 2010 18:29:56 +0000 (14:29 -0400)]
update Xsession.d script to avoid choking when /etc/monkeysphere/monkeysphere.conf has been removed

13 years agoMerge branch 'master' into debian
Daniel Kahn Gillmor [Fri, 7 May 2010 02:56:00 +0000 (22:56 -0400)]
Merge branch 'master' into debian

13 years agoreporting new expiration date when key expiry is updated (closes MS #2291)
Daniel Kahn Gillmor [Fri, 7 May 2010 02:25:28 +0000 (22:25 -0400)]
reporting new expiration date when key expiry is updated (closes MS #2291)

13 years agoMerge branch 'master' into debian
Daniel Kahn Gillmor [Thu, 6 May 2010 17:03:37 +0000 (13:03 -0400)]
Merge branch 'master' into debian

13 years agodo not fail or bail when admin interactively declines to publish a key with m-h
Daniel Kahn Gillmor [Thu, 6 May 2010 17:02:40 +0000 (13:02 -0400)]
do not fail or bail when admin interactively declines to publish a key with m-h

13 years agosyncing with master
Daniel Kahn Gillmor [Thu, 6 May 2010 15:25:46 +0000 (11:25 -0400)]
syncing with master

13 years agoMerge branch 'master' into debian
Daniel Kahn Gillmor [Thu, 6 May 2010 16:23:33 +0000 (12:23 -0400)]
Merge branch 'master' into debian

13 years agosupport x509 anchors for monkeysphere-host, allow shared anchors between m-a and...
Daniel Kahn Gillmor [Thu, 6 May 2010 15:24:55 +0000 (11:24 -0400)]
support x509 anchors for monkeysphere-host, allow shared anchors between m-a and mh (closes MS #2288)

13 years agoremember that the releases are being published via the monkeysphere-docs repo now.
Daniel Kahn Gillmor [Tue, 4 May 2010 05:04:18 +0000 (01:04 -0400)]
remember that the releases are being published via the monkeysphere-docs repo now.

13 years agoupdated scripts and notes for releasing
Daniel Kahn Gillmor [Sun, 18 Apr 2010 01:46:52 +0000 (21:46 -0400)]
updated scripts and notes for releasing

14 years agoupdated debian packaging for 0.30-1 release monkeysphere_0.30-1
Daniel Kahn Gillmor [Sun, 18 Apr 2010 00:36:04 +0000 (20:36 -0400)]
updated debian packaging for 0.30-1 release

14 years agoMerge branch 'master' into debian
Daniel Kahn Gillmor [Sun, 18 Apr 2010 00:35:20 +0000 (20:35 -0400)]
Merge branch 'master' into debian

14 years agopreparing a 0.30 release monkeysphere_0.30
Daniel Kahn Gillmor [Sun, 18 Apr 2010 00:35:10 +0000 (20:35 -0400)]
preparing a 0.30 release

14 years agodo not try to add to known_hosts if HASH_KNOWN_HOSTS is true but ssh-keygen is not...
Daniel Kahn Gillmor [Sun, 18 Apr 2010 00:16:52 +0000 (20:16 -0400)]
do not try to add to known_hosts if HASH_KNOWN_HOSTS is true but ssh-keygen is not available (includes some comments about how to fix these corner cases).

14 years agodegrade gracefully in the absence of ssh
Daniel Kahn Gillmor [Sat, 17 Apr 2010 21:30:18 +0000 (17:30 -0400)]
degrade gracefully in the absence of ssh

14 years agohandling ssh fingerprinting internally with keytrans for sshfprs-for-userid
Daniel Kahn Gillmor [Sat, 17 Apr 2010 20:44:19 +0000 (16:44 -0400)]
handling ssh fingerprinting internally with keytrans for sshfprs-for-userid

14 years agomake comment more nit-pickingly accurate
Daniel Kahn Gillmor [Sat, 17 Apr 2010 20:43:15 +0000 (16:43 -0400)]
make comment more nit-pickingly accurate

14 years agofix gpg_ssh_fingerprint() in monkeysphere to use internal implementation of ssh finge...
Daniel Kahn Gillmor [Sat, 17 Apr 2010 20:17:15 +0000 (16:17 -0400)]
fix gpg_ssh_fingerprint() in monkeysphere to use internal implementation of ssh fingerprinting

14 years agomonkeysphere-host no longer depends on ssh
Daniel Kahn Gillmor [Sat, 17 Apr 2010 20:13:53 +0000 (16:13 -0400)]
monkeysphere-host no longer depends on ssh

14 years agokeytrans openpgp2sshfpr now prints out the key size and type
Daniel Kahn Gillmor [Sat, 17 Apr 2010 20:05:55 +0000 (16:05 -0400)]
keytrans openpgp2sshfpr now prints out the key size and type

14 years agoadded internal openpgp2sshfpr subcommand for keytrans
Daniel Kahn Gillmor [Sat, 17 Apr 2010 19:57:47 +0000 (15:57 -0400)]
added internal openpgp2sshfpr subcommand for keytrans

14 years agoMerge branch 'master' into debian
Daniel Kahn Gillmor [Wed, 31 Mar 2010 22:17:10 +0000 (18:17 -0400)]
Merge branch 'master' into debian

14 years agoremoved monkeysphere.spec from master since it is now tracked in the rpm branch.
Daniel Kahn Gillmor [Wed, 31 Mar 2010 22:14:32 +0000 (18:14 -0400)]
removed monkeysphere.spec from master since it is now tracked in the rpm branch.