Clean up file header copyrights

  Project Purple isn't a legal entity; credit primary author of files
  and include a minimal GPL 2 header in each file rather than relying
  on the copy of LICENCE shipped with everything else.

diff --git a/add.c b/add.c
index a33b0c86587b276b770e48e413b537b8ba233ca1..6f919becfe7e30b077cfd11d079851a478fe0091 100644 (file)
--- a/add.c
+++ b/add.c
@@ -1,9 +1,20 @@
 /*
  * add.c - CGI to add keys.
  *
 /*
  * add.c - CGI to add keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007-2008 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/armor.c b/armor.c
index 397118cb22b7bffae17b963b89d1b7acdc9227f6..a730acd83bbfd1b2a8ed994b3fa1c7d6fd107c52 100644 (file)
--- a/armor.c
+++ b/armor.c
@@ -1,9 +1,20 @@
 /*
  * armor.c - Routines to (de)armor OpenPGP packet streams.
  *
 /*
  * armor.c - Routines to (de)armor OpenPGP packet streams.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004, 2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>

diff --git a/armor.h b/armor.h
index 8f5dc3522b0a3e20f4886475695cb8c123cacac8..663e11183b1e1f11d8cff4f2e02946fe963c6f96 100644 (file)
--- a/armor.h
+++ b/armor.h
@@ -1,9 +1,20 @@
 /*
  * armor.h - Routines to (de)armor OpenPGP packet streams.
  *
 /*
  * armor.h - Routines to (de)armor OpenPGP packet streams.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004, 2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __ARMOR_H__
  */
 
 #ifndef __ARMOR_H__

diff --git a/charfuncs.c b/charfuncs.c
index 8448aee1be579956a71b2480850fb534685b15d1..fab53a2c89eaa360c7e6d2f20d8dfe4f458d48af 100644 (file)
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -1,9 +1,20 @@
 /*
  * charfuncs.c - Routines for dealing with character streams.
  *
 /*
  * charfuncs.c - Routines for dealing with character streams.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/charfuncs.h b/charfuncs.h
index b09edf375cf58d33bbb61a06890817c7b992e491..b9c9c4638674bc7d777f8599cff2e1c74e0a9296 100644 (file)
--- a/charfuncs.h
+++ b/charfuncs.h
@@ -1,9 +1,20 @@
 /*
  * charfuncs.h - Routines for dealing with character streams.
  *
 /*
  * charfuncs.h - Routines for dealing with character streams.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __CHARFUNCS_H__
  */
 
 #ifndef __CHARFUNCS_H__

diff --git a/cleankey.c b/cleankey.c
index 4d1ec1c890424f347281f52655bbe31c248ce50c..d4046f3e47dd6529bdae02b78a222bacb4a2fe01 100644 (file)
--- a/cleankey.c
+++ b/cleankey.c
@@ -1,9 +1,20 @@
 /*
  * cleankey.c - Routines to look for common key problems and clean them up.
  *
 /*
  * cleankey.c - Routines to look for common key problems and clean them up.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdbool.h>
  */
 
 #include <stdbool.h>

diff --git a/cleankey.h b/cleankey.h
index 0d892021be9bf3211bd34c235c9adcd469747621..3277e882279b6b859b242ed8f3e7c068b4cd6b7d 100644 (file)
--- a/cleankey.h
+++ b/cleankey.h
@@ -1,9 +1,20 @@
 /*
  * cleankey.h - Routines to look for common key problems and clean them up.
  *
 /*
  * cleankey.h - Routines to look for common key problems and clean them up.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __CLEANKEY_H__
  */
 
 #ifndef __CLEANKEY_H__

diff --git a/cleanup.c b/cleanup.c
index ecb33220db942b9c0fa1c84dfc8c80149dfcb700..97d02c548bec9b27fbae1449bb59579930dc0bee 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -1,9 +1,20 @@
 /*
  * cleanup.c - Cleanup and shutdown framework.
  *
 /*
  * cleanup.c - Cleanup and shutdown framework.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <signal.h>
  */
 
 #include <signal.h>

diff --git a/cleanup.h b/cleanup.h
index c5361c9b34db6ab087d68a04d0dd4a0fe8d821d4..65f9aa36fee12bacb136fe55ab8b7b891d19cbe1 100644 (file)
--- a/cleanup.h
+++ b/cleanup.h
@@ -1,9 +1,20 @@
 /*
  * cleanup.h - Cleanup and shutdown framework.
  *
 /*
  * cleanup.h - Cleanup and shutdown framework.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __CLEANUP_H__
  */
 
 #ifndef __CLEANUP_H__

diff --git a/decodekey.c b/decodekey.c
index 7dd79927533d855bfbfb68ba6e309e0fb545d078..0b72e5b918699c98414863e64bb3e322d078bd21 100644 (file)
--- a/decodekey.c
+++ b/decodekey.c
@@ -2,6 +2,19 @@
  * decodekey.c - Routines to further decode an OpenPGP key.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
  * decodekey.c - Routines to further decode an OpenPGP key.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdbool.h>
  */
 
 #include <stdbool.h>

diff --git a/decodekey.h b/decodekey.h
index 242e8e4a341a1f5fbafa5358b1546ca2dea2a521..11e2448374882bdf8d1754b5c6f345299a34eadd 100644 (file)
--- a/decodekey.h
+++ b/decodekey.h
@@ -1,9 +1,20 @@
 /*
  * keyindex.h - Routines to list an OpenPGP key.
  *
 /*
  * keyindex.h - Routines to list an OpenPGP key.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __DECODEKEY_H__
  */
 
 #ifndef __DECODEKEY_H__

diff --git a/getcgi.c b/getcgi.c
index b15351cc28fc4baee252ec1486d72c73d024a7d2..203584149b1e38320b397916a7ea161aae7d6162 100644 (file)
--- a/getcgi.c
+++ b/getcgi.c
@@ -1,10 +1,23 @@
 /*
  * getcgivars.c - routine to read CGI input variables into an array.
  *
 /*
  * getcgivars.c - routine to read CGI input variables into an array.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>

  *
  * The x2c() and unescape_url() routines were lifted directly
  * from NCSA's sample program util.c, packaged with their HTTPD.
  *
  * The x2c() and unescape_url() routines were lifted directly
  * from NCSA's sample program util.c, packaged with their HTTPD.

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/getcgi.h b/getcgi.h
index a28fd165f3d68ad94251071e110455ba7da8801e..a3572c38fe2dd8b62aaef889cc2118db57533096 100644 (file)
--- a/getcgi.h
+++ b/getcgi.h
@@ -1,3 +1,22 @@
+/*
+ * getcgivars.c - routine to read CGI input variables into an array.
+ *
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+

 #ifndef __GETCGI_H_
 #define __GETCGI_H_
 
 #ifndef __GETCGI_H_
 #define __GETCGI_H_
 

diff --git a/gpgwww.c b/gpgwww.c
index fa898683061e22c7ac3628679b3f9bff30d2a9e4..3b35ad7a5d9a9b7239be5ec4f1a7a59195173fef 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -1,9 +1,20 @@
 /*
  * gpgwww.c - www interface to path finder.
 /*
  * gpgwww.c - www interface to path finder.

- * 
- * Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2001-2002 Project Purple.
+ * Copyright 2001-2004 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>

diff --git a/hash.c b/hash.c
index 66ae5e54dccfbf3984b54c6807946c8024c8845b..49443ed07093ded1c6a80d017fe46284ca481ed5 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -1,9 +1,20 @@
 /*
  * hash.c - hashing routines mainly used for caching key details.
  *
 /*
  * hash.c - hashing routines mainly used for caching key details.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2002 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2000-2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/hash.h b/hash.h
index 59a5901c49081afa4fe9e0fc7f84c21ff1325ab0..9d7578dcbd2fe0aa4fd7e0f2bedb1956f62ef541 100644 (file)
--- a/hash.h
+++ b/hash.h
@@ -1,9 +1,20 @@
 /*
  * hash.h - hashing routines mainly used for caching key details.
  *
 /*
  * hash.h - hashing routines mainly used for caching key details.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2002 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2000-2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __HASH_H__
  */
 
 #ifndef __HASH_H__

diff --git a/hashquery.c b/hashquery.c
index a0f8e1ececcda69ae814c3f820ca1da14457a868..478c20f9453bc5c327353fdba6a585c4b395947f 100644 (file)
--- a/hashquery.c
+++ b/hashquery.c
@@ -2,6 +2,19 @@
  * hashquery.c - CGI to handle SKS style /pks/hashquery requests
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>
  * hashquery.c - CGI to handle SKS style /pks/hashquery requests
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/keyarray.c b/keyarray.c
index 389eb0d86d65a867e67a319c0931c76edb5c26be..cb846de5811f5477e12e8b626c4d2036c6668a90 100644 (file)
--- a/keyarray.c
+++ b/keyarray.c
@@ -1,9 +1,20 @@
 /*
  * keyarray.c - routines to maintain a sorted array of keyids.
  *
 /*
  * keyarray.c - routines to maintain a sorted array of keyids.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdbool.h>
  */
 
 #include <stdbool.h>

diff --git a/keyarray.h b/keyarray.h
index a25ad7120c1ee977465cb68d5f386ce10e4008c6..86c5991f2777721e20ea043056b13b1aaa37db92 100644 (file)
--- a/keyarray.h
+++ b/keyarray.h
@@ -1,9 +1,20 @@
 /*
  * keyarray.h - routines to maintain a sorted array of keyids.
  *
 /*
  * keyarray.h - routines to maintain a sorted array of keyids.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __KEYARRAY_H__
  */
 
 #ifndef __KEYARRAY_H__

diff --git a/keyd.c b/keyd.c
index 4534a570d263e0840101a3f7f8695fdee8e91a8e..5911ce9104a967a10cd9d46758223896b2a7dccd 100644 (file)
--- a/keyd.c
+++ b/keyd.c
@@ -1,9 +1,20 @@
 /*
  * keyd.c - key retrieval daemon
  *
 /*
  * keyd.c - key retrieval daemon
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/keyd.h b/keyd.h
index 4313a4f005dd4a96c33e887b425ef5d15d6981b9..915b1b64385978c6b1268727eb4fec340f46bd1a 100644 (file)
--- a/keyd.h
+++ b/keyd.h
@@ -1,9 +1,20 @@
 /*
  * keyd.h - Public API for keyd.
  *
 /*
  * keyd.h - Public API for keyd.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __KEYD_H__
  */
 
 #ifndef __KEYD_H__

diff --git a/keydb.c b/keydb.c
index 2abfa02bae51ae8a9d8d7b3f587844b66c4b29ca..00bb3ff815e2216f8042934cdced6747c59642f5 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -1,9 +1,20 @@
 /*
  * keydb.c - Routines for DB access that just use store/fetch.
  *
 /*
  * keydb.c - Routines for DB access that just use store/fetch.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 /**
  */
 
 /**

diff --git a/keydb.h b/keydb.h
index aaca12201aea48bc8233e71c5854d6046dfb5a97..5e511d53f19d5594c263be72092954c4b57c9a00 100644 (file)
--- a/keydb.h
+++ b/keydb.h
@@ -1,9 +1,20 @@
 /*
  * keydb.h - Routines to store and fetch keys.
  *
 /*
  * keydb.h - Routines to store and fetch keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __KEYDB_H__
  */
 
 #ifndef __KEYDB_H__

diff --git a/keydb_db2.c b/keydb_db2.c
index affdc4b147682c55ab739d432c91283a695645db..4ba31e871c077f4b07f653bb101fd57c4f6064b1 100644 (file)
--- a/keydb_db2.c
+++ b/keydb_db2.c
@@ -1,9 +1,20 @@
 /*
  * keydb_db2.c - Routines to store and fetch keys in a DB2 file (a la pksd)
  *
 /*
  * keydb_db2.c - Routines to store and fetch keys in a DB2 file (a la pksd)
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

diff --git a/keydb_db4.c b/keydb_db4.c
index eb41f86652fea31ba0ab3384cecb97883e447bc9..04d727c6eb8df6df3778f98c67b070686243491e 100644 (file)
--- a/keydb_db4.c
+++ b/keydb_db4.c
@@ -2,6 +2,19 @@
  * keydb_db4.c - Routines to store and fetch keys in a DB4 database.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
  * keydb_db4.c - Routines to store and fetch keys in a DB4 database.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

diff --git a/keydb_dynamic.c b/keydb_dynamic.c
index ae2b8056870dba7a2a27c75c37ac5193fd275490..10bec165e6decd21c6820095fd6f21abfd0057fa 100644 (file)
--- a/keydb_dynamic.c
+++ b/keydb_dynamic.c
@@ -1,9 +1,20 @@
 /*
  * keydb_dynamic.c - backend that can load the other backends
  *
 /*
  * keydb_dynamic.c - backend that can load the other backends
  *

- * Brett Parker <iDunno@sommitrealweird.co.uk>
+ * Copyright 2005 Brett Parker <iDunno@sommitrealweird.co.uk>

  *
  *

- * Copyright 2005 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <dlfcn.h>
  */
 
 #include <dlfcn.h>

diff --git a/keydb_file.c b/keydb_file.c
index e99c26898af3385f2237fe7a86e613b850814846..e1d0b528bc1f06eb08e3fdd473830603d82c1bcf 100644 (file)
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -1,9 +1,20 @@
 /*
  * keydb.c - Routines to store and fetch keys.
  *
 /*
  * keydb.c - Routines to store and fetch keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

diff --git a/keydb_fs.c b/keydb_fs.c
index 02adf6bae1972b069c393581f92fcea3fde1ee1d..ea09c7c0dae882e0684f3174c35397e26fccadaa 100644 (file)
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -1,9 +1,20 @@
 /*
 /*

- * keydb.h - Routines to store and fetch keys.
+ * keydb_fs.c - Routines to store and fetch keys in a filesystem hierarchy.

  *
  *

- * Daniel Silverstone <dsilvers@digital-scurf.org>
+ * Copyright 2004 Daniel Silverstone <dsilvers@digital-scurf.org>

  *
  *

- * Copyright 2004 Daniel Silverstone and Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

diff --git a/keydb_keyd.c b/keydb_keyd.c
index ceedd87a84de1337c36524d4a8012fd4464557b8..0f501fe47c07e17b09f1d63b5913c336f7968e66 100644 (file)
--- a/keydb_keyd.c
+++ b/keydb_keyd.c
@@ -1,9 +1,20 @@
 /*
  * keydb_keyd.c - Routines to talk to keyd backend.
  *
 /*
  * keydb_keyd.c - Routines to talk to keyd backend.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/keydb_pg.c b/keydb_pg.c
index 0771317e747ab1c65a22e5ef71ddb2e7a936a903..8e0543b9f061210c5afda582f889d1d0009156cc 100644 (file)
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -1,9 +1,20 @@
 /*
  * keydb_pg.c - Routines to store and fetch keys in a PostGres database.
  *
 /*
  * keydb_pg.c - Routines to store and fetch keys in a PostGres database.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <postgresql/libpq-fe.h>
  */
 
 #include <postgresql/libpq-fe.h>

diff --git a/keydctl.c b/keydctl.c
index c66ce28794173515aaceef42fec5c10804108916..e46a355c5aa41aa5030c75c0cd3c04e1e1eb6815 100644 (file)
--- a/keydctl.c
+++ b/keydctl.c
@@ -2,6 +2,19 @@
  * keydctl.c - A simple program to control a running keyd instance
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>
  * keydctl.c - A simple program to control a running keyd instance
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/keyid.c b/keyid.c
index 29c61f00137134f0685d5bdc382a25a3ac12b2a8..a7051f2d23552dc1bc8b5f9c464ced26c11f3f05 100644 (file)
--- a/keyid.c
+++ b/keyid.c
@@ -1,9 +1,20 @@
 /*
  * keyid.c - Routines to calculate key IDs.
  *
 /*
  * keyid.c - Routines to calculate key IDs.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <string.h>
  */
 
 #include <string.h>

diff --git a/keyid.h b/keyid.h
index 08bf1fea8d694e36231e000f73f0bc581c09b0c2..d6e48e6ceb1d54ca6f2a0b511464dc8db54ef0d5 100644 (file)
--- a/keyid.h
+++ b/keyid.h
@@ -1,9 +1,20 @@
 /*
  * keyid.h - Routines to calculate key IDs.
  *
 /*
  * keyid.h - Routines to calculate key IDs.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __KEYID_H__
  */
 
 #ifndef __KEYID_H__

diff --git a/keyindex.c b/keyindex.c
index 6aab5d3c73da891faeebe6d3262d3420a464fead..eee2e8a6f867415c3651c5c5d57f0b00424d00ae 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -2,6 +2,19 @@
  * keyindex.c - Routines to list an OpenPGP key.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
  * keyindex.c - Routines to list an OpenPGP key.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>

diff --git a/keyindex.h b/keyindex.h
index c3cb9eca4ed6c847f1896697c35ffa978523113e..c9a584328cb0b43ea24a79a80bc687947832890b 100644 (file)
--- a/keyindex.h
+++ b/keyindex.h
@@ -1,9 +1,20 @@
 /*
  * keyindex.h - Routines to list an OpenPGP key.
  *
 /*
  * keyindex.h - Routines to list an OpenPGP key.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __KEYINDEX_H__
  */
 
 #ifndef __KEYINDEX_H__

diff --git a/keystructs.h b/keystructs.h
index c77e346e419e6ce139b54fa5993ad936ac15aecb..4aa8bcb9be37021bc0fa4068723c386544521d0a 100644 (file)
--- a/keystructs.h
+++ b/keystructs.h
@@ -1,9 +1,20 @@
 /*
  * keystructs.h - Structures for OpenPGP keys
  *
 /*
  * keystructs.h - Structures for OpenPGP keys
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __KEYSTRUCTS_H__
  */
 
 #ifndef __KEYSTRUCTS_H__

diff --git a/ll.c b/ll.c
index 018ea0d72ccdc19fee6877357d3741282e6fa01e..ed6315a4e2048b1a5d0b8ec56f79a96218e380b6 100644 (file)
--- a/ll.c
+++ b/ll.c
@@ -1,9 +1,20 @@
 /*
  * ll.c - various things of used for dealing with linked lists.
  *
 /*
  * ll.c - various things of used for dealing with linked lists.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2000-2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/ll.h b/ll.h
index 464f99b0553eaf23c8f112af4ffd20feb2fb084e..fcdbc5a37759af488e935c63c2eab841ebbe4627 100644 (file)
--- a/ll.h
+++ b/ll.h
@@ -1,9 +1,20 @@
 /*
  * ll.h - various things of used for dealing with linked lists.
  *
 /*
  * ll.h - various things of used for dealing with linked lists.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __LL_H__
  */
 
 #ifndef __LL_H__

diff --git a/log.c b/log.c
index bb7461b67ec3374d1150fb429e985800c2bf7df5..7b17cb0d4191dc209fc1014a5c58df35f5d836c8 100644 (file)
--- a/log.c
+++ b/log.c
@@ -1,9 +1,20 @@
 /*
  * log.c - Simple logging framework.
  *
 /*
  * log.c - Simple logging framework.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2003 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2003 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdarg.h>
  */
 
 #include <stdarg.h>

diff --git a/log.h b/log.h
index 818f5f2d96ef61162080bfb79a028d25c3f640f8..77770bc1abc67d0a6acfda5845363b7ac939e729 100644 (file)
--- a/log.h
+++ b/log.h
@@ -1,9 +1,20 @@
 /*
  * log.h - Simple logging framework.
  *
 /*
  * log.h - Simple logging framework.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2003 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2003 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __LOG_H__
  */
 
 #ifndef __LOG_H__

diff --git a/lookup.c b/lookup.c
index 9a9ccbd7a80d68c46a300db30ccb0430058b4aa3..cdd8c72c23e52bbe2a7d102302abee1d492d8422 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -1,9 +1,20 @@
 /*
  * lookup.c - CGI to lookup keys.
  *
 /*
  * lookup.c - CGI to lookup keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2005,2007-2009,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>

diff --git a/marshal.c b/marshal.c
index 2e9b55b556492601365ce49958c5eac023fd7624..57c40bb78ecb008bff7b840032b960d837cca858 100644 (file)
--- a/marshal.c
+++ b/marshal.c
@@ -2,6 +2,19 @@
  * marshal.c - SKS compatible marshalling routines
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>
  * marshal.c - SKS compatible marshalling routines
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <arpa/inet.h>
  */
 
 #include <arpa/inet.h>

diff --git a/marshal.h b/marshal.h
index 432e51d817ea9959317ea27150a5100bb9cce5e4..056047e740ae6236cafd5e95e7fc54db4fd5662f 100644 (file)
--- a/marshal.h
+++ b/marshal.h
@@ -2,6 +2,19 @@
  * marshal.h - SKS compatible marshalling routines
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>
  * marshal.h - SKS compatible marshalling routines
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __MARSHAL_H__
  */
 
 #ifndef __MARSHAL_H__

diff --git a/maxpath.c b/maxpath.c
index 0bdc04b9c49bba84ad72e1ec96d7945919eb2e20..81a2b22b8d2f4fbfa126dcc7751ee08e4f645cc6 100644 (file)
--- a/maxpath.c
+++ b/maxpath.c
@@ -1,9 +1,20 @@
 /*
  * maxpath.c - Find the longest trust path in the key database.
 /*
  * maxpath.c - Find the longest trust path in the key database.

- * 
- * Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2001-2002 Project Purple.
+ * Copyright 2001-2002 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/mem.c b/mem.c
index 47f296744d3e1c25e93c8cafd5aeaed913d03297..2f13cf5fffc71fb07d92d4b74c7b0c12760324d3 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -1,9 +1,20 @@
 /*
  * mem.c - Routines to cleanup memory after use.
  *
 /*
  * mem.c - Routines to cleanup memory after use.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/mem.h b/mem.h
index 875bb4c3049e8f4ee5dcd9a26d4b50462b90d5da..de9356790de70d262c6eb1dc7c09736ee9068985 100644 (file)
--- a/mem.h
+++ b/mem.h
@@ -1,9 +1,20 @@
 /*
  * mem.h - Routines to cleanup memory after use.
  *
 /*
  * mem.h - Routines to cleanup memory after use.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __MEM_H_
  */
 
 #ifndef __MEM_H_

diff --git a/merge.c b/merge.c
index 118e757737796871352c9ce2a2b421a2b5c19850..9dcbf4d20fc3c784df361cb68e6c6a2d8ec5dac2 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -1,9 +1,20 @@
 /*
  * merge.c - Routines to merge OpenPGP public keys.
  *
 /*
  * merge.c - Routines to merge OpenPGP public keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2005,2007,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2005 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/merge.h b/merge.h
index 770da9eee3f331fdcd00e25ddd0dcc765d7cef45..f88050ac5c7b89297b5b0fd8b8cfe186ff760abc 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -1,9 +1,20 @@
 /*
  * merge.h - Routines to merge OpenPGP public keys.
  *
 /*
  * merge.h - Routines to merge OpenPGP public keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2005,2007,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __MERGE_H__
  */
 
 #ifndef __MERGE_H__

diff --git a/onak-conf.c b/onak-conf.c
index 5f07e02426e25b22594e6eb2f7da74263fe6dc31..6d72e6fd4e7e3d53ac86ab30760c45ffb7020d04 100644 (file)
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -1,9 +1,20 @@
 /*
  * onak-conf.c - Routines related to runtime config.
  *
 /*
  * onak-conf.c - Routines related to runtime config.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include "config.h"
  */
 
 #include "config.h"

diff --git a/onak-conf.h b/onak-conf.h
index 16763c6d1d8ff3fc6de91a1f1a8c8159abf8069b..518c30616348d1af8cb1e442f1d7b713e3c15657 100644 (file)
--- a/onak-conf.h
+++ b/onak-conf.h
@@ -1,9 +1,20 @@
 /*
  * onak-conf.h - Routines related to runtime config.
  *
 /*
  * onak-conf.h - Routines related to runtime config.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __ONAK_CONF_H_
  */
 
 #ifndef __ONAK_CONF_H_

diff --git a/onak-mail.pl.in b/onak-mail.pl.in
index c635dfba601e5490352c2ac17f0c040e70e54979..77a3d3677de9174f42587601bf8bb802be8894bf 100644 (file)
--- a/onak-mail.pl.in
+++ b/onak-mail.pl.in
@@ -2,8 +2,7 @@
 #
 # onak-mail.pl - Mail processing interface for onak, an OpenPGP Keyserver.
 #
 #
 # onak-mail.pl - Mail processing interface for onak, an OpenPGP Keyserver.
 #

-# Written by Jonathan McDowell <noodles@earth.li>
-# Copyright 2002-2005 Project Purple
+# Copyright 2002-2005 Jonathan McDowell <noodles@earth.li>

 # Released under the GPL.
 #
 
 # Released under the GPL.
 #
 

diff --git a/onak.c b/onak.c
index 4ba3a7abda38e76852f0150e1989a903a89fb7aa..b295fea2126ca772fc96869d59bd180cdd7b8f31 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -3,9 +3,20 @@
  *
  * This is the main swiss army knife binary.
  *
  *
  * This is the main swiss army knife binary.
  *

- * Jonathan McDowell <noodles@earth.li>
- * 
- * Copyright 2002 Project Purple
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <fcntl.h>
  */
 
 #include <fcntl.h>

diff --git a/openpgp.h b/openpgp.h
index 7ccf1332a341db37095304b8fe37e75121d03008..dc6bf558cf2295a74a5c7837e3dacca33273b6e1 100644 (file)
--- a/openpgp.h
+++ b/openpgp.h
@@ -2,6 +2,19 @@
  * openpgp.h - Defines directly related to OpenPGP RFC 4880
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>
  * openpgp.h - Defines directly related to OpenPGP RFC 4880
  *
  * Copyright 2011 Jonathan McDowell <noodles@earth.li>

+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __OPENPGP_H__
  */
 
 #ifndef __OPENPGP_H__

diff --git a/parsekey.c b/parsekey.c
index 349d5c862903e6fecad1f3b00c804d6d0620e835..517b0294a1452d26f23717052df85e64697365a3 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -1,9 +1,20 @@
 /*
  * parsekey.c - Routines to parse an OpenPGP key.
  *
 /*
  * parsekey.c - Routines to parse an OpenPGP key.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007-2008,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdbool.h>
  */
 
 #include <stdbool.h>

diff --git a/parsekey.h b/parsekey.h
index 8718d1c910dc9bf9150a8499393d3d3dcc1bcfe9..e9bea4114be8c28b79b819f7b45e240bda8d2b78 100644 (file)
--- a/parsekey.h
+++ b/parsekey.h
@@ -1,9 +1,20 @@
 /*
  * parsekey.h - Routines to parse an OpenPGP key.
  *
 /*
  * parsekey.h - Routines to parse an OpenPGP key.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007-2008,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __PARSEKEY_H__
  */
 
 #ifndef __PARSEKEY_H__

diff --git a/photoid.c b/photoid.c
index dd28753e49f6dfd4ef6e82b7b395e87069d535e9..febc3f5441847be211fb02e40c405201c8789447 100644 (file)
--- a/photoid.c
+++ b/photoid.c
@@ -1,9 +1,20 @@
 /*
  * photoid.c - Routines for OpenPGP id photos.
  *
 /*
  * photoid.c - Routines for OpenPGP id photos.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>

diff --git a/photoid.h b/photoid.h
index 86f050ab662327277e80383c62c49f790036ed71..aaafe34aeddd358d3673033abc77d89648ca77e2 100644 (file)
--- a/photoid.h
+++ b/photoid.h
@@ -1,9 +1,20 @@
 /*
  * photoid.h - Routines for OpenPGP id photos.
  *
 /*
  * photoid.h - Routines for OpenPGP id photos.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __PHOTOID_H__
  */
 
 #ifndef __PHOTOID_H__

diff --git a/sendsync.c b/sendsync.c
index 1d41d4d5434e5a542ba6a37be9638378943bf461..53ea713cafbd362b32bc484c49a501cd26c3306a 100644 (file)
--- a/sendsync.c
+++ b/sendsync.c
@@ -1,9 +1,20 @@
 /*
  * sendsync.c - Routines to send a key sync mail.
  *
 /*
  * sendsync.c - Routines to send a key sync mail.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 1999, 2002, 2005, 2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 1999, 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/sendsync.h b/sendsync.h
index 85f7d2bc6756b7596c0e67cc0b11a9bcd026febd..8776e5a26f4bbb2e6b84f646fbc022b7eb327268 100644 (file)
--- a/sendsync.h
+++ b/sendsync.h
@@ -1,9 +1,20 @@
 /*
  * sendsync.c - Routines to send a key sync mail.
  *
 /*
  * sendsync.c - Routines to send a key sync mail.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 1999, 2002, 2005, 2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 1999, 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __SENDSYNC_H_
  */
 
 #ifndef __SENDSYNC_H_

diff --git a/sixdegrees.c b/sixdegrees.c
index 10b58d687f06dcc69b36b1ac522039836735590f..e6a35947b00a3030c905a54ea36ef4c7617ab28d 100644 (file)
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -1,9 +1,20 @@
 /*
  * sixdegrees.c - List the size of the six degrees of trust away from a key.
 /*
  * sixdegrees.c - List the size of the six degrees of trust away from a key.

- * 
- * Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2001-2002 Project Purple.
+ * Copyright 2001-2002 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/splitkeys.c b/splitkeys.c
index 86a83632a3baf786fac8b9cf2373cae03de041c0..fdc20a288dfb1250a5ce218ab647714fc495d98d 100644 (file)
--- a/splitkeys.c
+++ b/splitkeys.c
@@ -1,9 +1,20 @@
 /*
  * splitkeys.c - Split a keyring into smaller chunks.
  *
 /*
  * splitkeys.c - Split a keyring into smaller chunks.
  *

- * Jonathan McDowell <noodles@earth.li>
- * 
- * Copyright 2003 Project Purple
+ * Copyright 2003 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <fcntl.h>
  */
 
 #include <fcntl.h>

diff --git a/stats.c b/stats.c
index 88d7a050de183bc266367e1ed3fe3d3225845ba4..bcc4f9128d9a93825ae6e12e7c76378890e9dab2 100644 (file)
--- a/stats.c
+++ b/stats.c
@@ -1,9 +1,20 @@
 /*
  * stats.c - various routines to do stats on the key graph
  *
 /*
  * stats.c - various routines to do stats on the key graph
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2004,2007-2009 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2000-2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/stats.h b/stats.h
index 3696e0849283cbd9e76a9e6e4f04532ca9e2753d..19637eb2dba4e470af0dbbf168de6741b7d356e8 100644 (file)
--- a/stats.h
+++ b/stats.h
@@ -1,9 +1,20 @@
 /*
  * stats.c - various routines to do stats on the key graph
  *
 /*
  * stats.c - various routines to do stats on the key graph
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2004,2007-2009 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 /* MOSTSIGNED
  */
 
 /* MOSTSIGNED

diff --git a/stripkey.c b/stripkey.c
index 12d8791526a5ddd107b2c436b3458010bef65c2d..cefab42fe97479ce10e2856ce3b6857e36b4ee27 100644 (file)
--- a/stripkey.c
+++ b/stripkey.c
@@ -1,3 +1,22 @@
+/*
+ * stripkey.c - Strip a key of all signatures except self-sigs.
+ *
+ * Copyright 2004 Daniel Silverstone <dsilvers@digital-scurf.org>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+

 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/wordlist.c b/wordlist.c
index 791c55d96e6fb10274c9084b12d7ed8541280b33..605ec06967752a4209be7591c966d2209f6618d3 100644 (file)
--- a/wordlist.c
+++ b/wordlist.c
@@ -1,9 +1,20 @@
 /*
  * wordlist.c - Routines for manipulating word lists
  *
 /*
  * wordlist.c - Routines for manipulating word lists
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <ctype.h>
  */
 
 #include <ctype.h>

diff --git a/wordlist.h b/wordlist.h
index 65ddcad3d2941c14062667a34908880ae8c607c1..08466bcac986446a9ce6bd31f8d5489c2b69a13c 100644 (file)
--- a/wordlist.h
+++ b/wordlist.h
@@ -1,9 +1,20 @@
 /*
  * wordlist.h - Routines for manipulating word lists
  *
 /*
  * wordlist.h - Routines for manipulating word lists
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __WORDLIST_H__
  */
 
 #ifndef __WORDLIST_H__