Merge branch 'tarballs' into release

Conflicts:
	scripts/db_migrations/version2.sh (file permissions)

Signed-off-by: Michael Tänzer <neo@nhng.de>

5 files changed, 317 insertions, 0 deletions

diff --git a/scripts/47us-fudcon-lawrence-email.txt b/scripts/47us-fudcon-lawrence-email.txt
new file mode 100644
index 0000000..d2b6e97
--- /dev/null
+++ b/scripts/47us-fudcon-lawrence-email.txt
@@ -0,0 +1,26 @@
+Hi,

+

+I'm a Fedora developer and sysadmin (and a CAcert Assurer), and am going to be attending the Fedora Users and Developers Conference which will be held at the University of Kansas, located in Lawrence, KS, from January 18–20, 2013.

+

+We have a GPG/PGP keysigning party planned, and I'm interested in getting some people together to offer CAcert assurances.  This is especially important since CAcert will be removing all points formerly obtained by Thawte Point Transfer very soon.

+

+The CAcert Assurance Event will be held on Saturday, January 19, 2013, beginning at 15:30.

+The GPG Keysigning Event will begin at 16:30.

+

+If you are interested in either event, please sign up at:

+http://bit.ly/fudcon2013-keysigning for the keysigning event

+and/or

+http://bit.ly/fudcon2013-cacert-assurance for the CAcert assurance event.

+

+Please contact me at either nb@fedoraproject.org or nb@cacert.org if you have any questions.

+

+Nick

+

+Further infos:

+ * [https://wiki.cacert.org/Events/FUDConLawrence]

+  * CAcert organizing wiki page

+ * [http://fedoraproject.org/wiki/FUDCon:Lawrence_2013]

+  * has more information about FUDCon.

+

+

+Contact: events@cacert.org

diff --git a/scripts/47us-fudcon-lawrence-mail.php.txt b/scripts/47us-fudcon-lawrence-mail.php.txt
new file mode 100644
index 0000000..4bb3c8a
--- /dev/null
+++ b/scripts/47us-fudcon-lawrence-mail.php.txt
@@ -0,0 +1,109 @@
+#!/usr/bin/php -q

+<? /*

+    LibreSSL - CAcert web application

+    Copyright (C) 2004-2009  CAcert Inc.

+

+    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_once("../includes/mysql.php");

+

+	$lines = "";

+	$fp = fopen("47us-fudcon-lawrence-email.txt", "r");

+	while(!feof($fp))

+	{

+		$line = trim(fgets($fp, 4096));

+		$lines .= wordwrap($line, 75, "\n")."\n";

+	}

+	fclose($fp);

+

+

+//	$locid = intval($_REQUEST['location']);

+//	$maxdist = intval($_REQUEST['maxdist']);

+//  maxdist in [Km]

+  $maxdist = 200;

+

+

+// location      location.ID

+//   verified: 29.4.09 u.schroeter

+//   $locid = 7902857;       // Paris

+//   $locid = 238568;        // Bielefeld  

+//   $locid = 715191;        // Hamburg    

+//   $locid = 1102495;       // London     

+//   $locid = 606058;        // Frankfurt  

+//   $locid = 1775784;       // Stuttgart  

+//   $locid = 228950;        // Berlin  

+//   $locid = 606058;        // Frankfurt

+//   $locid = 599389;        // Flensburg

+//   $locid = 61065;        // Amsterdam, Eemnes

+//   $locid = 228950;        // Berlin  

+//   $locid = 2138880;      // Baltimore (Baltimore (city)), Maryland, United States   

+//   $locid = 1486658;       // Potsdam

+//   $locid = 664715;       // Goteborg, Vastra Gotaland, Sweden

+//   $locid = 2094781;       // Mission Hills (Los Angeles), California, United States 

+//   $locid = 423655;       // Copenhagen, Kobenhavn*, Denmark 

+//   $locid = 2093625;       // Los Angeles, CA ???

+//   $locid = 2094326       // Los Angeles (Los Angeles), California, United States

+//   $locid = 2257312;       // Sydney, New South Wales, Australia

+//   $locid = 572764;       //  Essen, Nordrhein-Westfalen, Germany 

+//   $locid = 78;       //  Aachen, Nordrhein-Westfalen, Germany 

+//   $locid = 1260319;       // Muenchen    

+//   $locid = 266635;       // Bonn, Nordrhein-Westfalen, Germany

+//   $locid = 873779;       // Karlsruhe, Baden-Wuerttemberg, Germany

+//   $locid = 520340;       // Dusseldorf, Nordrhein-Westfalen, Germany

+//       $locid = 2262656;       // Melbourne, Victoria, Australia

+//   $locid = 2185076;       // Raleigh (Wake), North Carolina, United States

+

+// CAcert Assurance and Keysigning event at FUDcon, Lawrence, KS, Jan 19th 2013

+   $locid = 2126955;       // Lawrence (Douglas), Kansas, United States

+   $eventname = "CAcert Assurance and Keysigning at FUDcon Lawrence, KS";

+   $city = "January 19th 2013";

+

+

+	$query = "select * from `locations` where `id`='$locid'";

+        $loc = mysql_fetch_assoc(mysql_query($query));

+

+	$query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + 

+			(COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * 

+			 COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.* 

+			FROM `locations`

+				inner join `users`  on `users`.`locid` = `locations`.`id` 

+				inner join `alerts` on `users`.`id`=`alerts`.`memid`

+				inner join `notary` on `users`.`id`=`notary`.`to`

+			WHERE 	(`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)

+			GROUP BY `users`.`id`

+			HAVING `distance` <= '$maxdist' 

+			ORDER BY `distance` ";

+	 echo $query;

+

+    // comment next line when starting to send mail not only to me 

+    //	$query = "select * from `users` where `email` like 'cacerttest%'";

+

+	$res = mysql_query($query);

+	$xrows = mysql_num_rows($res);

+

+	while($row = mysql_fetch_assoc($res))

+	{

+    //    uncomment next line to send mails ...

+		sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);

+	}

+  // 1x cc to events.cacert.org

+	sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);

+	// 1x mailing report to events.cacert.org

+  sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);	

+

+	// 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1

+  sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);	

+	echo "invitation sent to $xrows recipients.\n";

+

+?>

diff --git a/scripts/48de-ate-kiel-email.txt b/scripts/48de-ate-kiel-email.txt
new file mode 100644
index 0000000..d522cdc
--- /dev/null
+++ b/scripts/48de-ate-kiel-email.txt
@@ -0,0 +1,68 @@
+[Deutsch]

+

+Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher

+eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen.

+Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. in dem CAcert Community Agreement) wurden beschlossen. Die Assurer Training Events wollen versuchen, die ganzen Informationen unter’s Volk zu bringen:

+

+- Welcher Satz fehlt auf alten CAP Formularen?

+- Warum soll ich mir R/L/O einpraegen?

+- Wie verhaelst du dich, wenn du ein fremdes Ausweis Dokument das erste mal pruefst?

+

+Antworten auf diese und weitere Fragen erhaelst du bei den Assurer Training Events (ATEs).

+

+Darueberhinaus wird beim ATE der Vorgang der Identitaetsueberpruefung trainiert und auditiert, um die Qualitaet der Assurances in der taeglichen Praxis zu erfassen. Dabei gilt es moegliche Fehler und Fallstricke zu erkennen und aufzudecken. Die Assurer haben also die Moeglichkeit, sich mit den Fehlern auseinanderzusetzen und zu erfahren, wie diese vermieden werden koennen.

+

+Wie IanG sagte: The ATE or Assurer Training Event is exceptionally recommended for all Assurers, and include parts which contribute directly to our audit. Come and find out how you can also contribute.

+

+Die kommende Veranstaltung in deiner Naehe findet statt am:

+

+- Dienstag, den 11. Februar 2013

+- in der Zeit von: 19:00 - ca. 22:00 Uhr

+- Toppoint e.V.

+- Eckernförder Str. 20

+- 24103 Kiel 

+

+Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im

+Wiki [http://wiki.cacert.org/Events/2013-02-11ATE-Kiel]

+Blog [http://blog.cacert.org/2013/01/586.html]

+

+Teilnehmer Registrierung mit Rueckantwort:

+ 'Ich moechte am ATE-Kiel teilnehmen'

+

+Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme.

+

+Kontakt: events@cacert.org

+

+

+

+[English]

+

+During the last year many changes took place inside CAcert. Many "oral" rules have been put into Policies. New procedures (e.g. Assurer Challenge) and obligations (e.g. CAcert Community Agreement) have been put into live. The Assurer Training Events (ATE) try to spread this information:

+

+- What is missing on the "old" CAP forms?

+- Why should I remember R/L/O?

+- What can you do if an Assuree shows an ID document unknown to you?

+

+These and more questions will be answered during the Assurer Training Events (ATEs)

+

+Furthermore, the ATE trains how to do assurances and audits assurances, to measure the quality of assurances in the daily routine. Here are some possible errors and pitfalls which need to be found. Assurers have the opportunity to see those errors and how to avoid them.

+

+As IanG said: The ATE or Assurer Training Event is exceptionally recommended for all Assurers and includes parts which contribute directly to our audit. Come and find out how you can also contribute.

+

+The next event held in your area will be:

+

+- Tuesday 11. February 2013

+- during 19:00 - ca. 22:00

+- Toppoint e.V.

+- Eckernförder Str. 20

+- 24103 Kiel 

+

+Details to the location can be found: 

+Wiki [http://wiki.cacert.org/Events/2013-02-11ATE-Kiel]

+Blog [http://blog.cacert.org/2013/01/586.html]

+

+User reply for registration: 'I will attend the ATE-Kiel'

+

+The event team is looking forward for your attendance:

+

+Contact: events@cacert.org

diff --git a/scripts/48de-ate-kiel-mail.php.txt b/scripts/48de-ate-kiel-mail.php.txt
new file mode 100644
index 0000000..9f3ab46
--- /dev/null
+++ b/scripts/48de-ate-kiel-mail.php.txt
@@ -0,0 +1,114 @@
+#!/usr/bin/php -q

+<? /*

+    LibreSSL - CAcert web application

+    Copyright (C) 2004-2009  CAcert Inc.

+

+    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_once("../includes/mysql.php");

+

+	$lines = "";

+	$fp = fopen("48de-ate-kiel-email.txt", "r");

+	while(!feof($fp))

+	{

+		$line = trim(fgets($fp, 4096));

+		$lines .= wordwrap($line, 75, "\n")."\n";

+	}

+	fclose($fp);

+

+

+//	$locid = intval($_REQUEST['location']);

+//	$maxdist = intval($_REQUEST['maxdist']);

+//  maxdist in [Km]

+  $maxdist = 200;

+

+

+// location      location.ID

+//   verified: 29.4.09 u.schroeter

+//   $locid = 7902857;       // Paris

+//   $locid = 238568;        // Bielefeld  

+//   $locid = 715191;        // Hamburg    

+//   $locid = 1102495;       // London     

+//   $locid = 606058;        // Frankfurt  

+//   $locid = 1775784;       // Stuttgart  

+//   $locid = 228950;        // Berlin  

+//   $locid = 606058;        // Frankfurt

+//   $locid = 599389;        // Flensburg

+//   $locid = 61065;        // Amsterdam, Eemnes

+//   $locid = 228950;        // Berlin  

+//   $locid = 2138880;      // Baltimore (Baltimore (city)), Maryland, United States   

+//   $locid = 1486658;       // Potsdam

+//   $locid = 664715;       // Goteborg, Vastra Gotaland, Sweden

+//   $locid = 2094781;       // Mission Hills (Los Angeles), California, United States 

+//   $locid = 423655;       // Copenhagen, Kobenhavn*, Denmark 

+//   $locid = 2093625;       // Los Angeles, CA ???

+//   $locid = 2094326       // Los Angeles (Los Angeles), California, United States

+//   $locid = 2257312;       // Sydney, New South Wales, Australia

+//   $locid = 572764;       //  Essen, Nordrhein-Westfalen, Germany 

+//   $locid = 78;       //  Aachen, Nordrhein-Westfalen, Germany 

+//   $locid = 1260319;       // Muenchen    

+//   $locid = 266635;       // Bonn, Nordrhein-Westfalen, Germany

+//   $locid = 873779;       // Karlsruhe, Baden-Wuerttemberg, Germany

+//   $locid = 520340;       // Dusseldorf, Nordrhein-Westfalen, Germany

+//       $locid = 2262656;       // Melbourne, Victoria, Australia

+//   $locid = 2185076;       // Raleigh (Wake), North Carolina, United States

+

+// CAcert Assurance and Keysigning event at FUDcon, Lawrence, KS, Jan 19th 2013

+//   $locid = 2126955;       // Lawrence (Douglas), Kansas, United States

+//   $eventname = "CAcert Assurance and Keysigning at FUDcon Lawrence, KS";

+//   $city = "January 19th 2013";

+

+// ATE-Kiel 2013-02-11

+   $locid = 919560;       // Kiel, Schleswig-Holstein, Germany

+   $eventname = "ATE-Kiel";

+   $city = "11. Februar 2013";

+

+

+	$query = "select * from `locations` where `id`='$locid'";

+        $loc = mysql_fetch_assoc(mysql_query($query));

+

+	$query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + 

+			(COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * 

+			 COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.* 

+			FROM `locations`

+				inner join `users`  on `users`.`locid` = `locations`.`id` 

+				inner join `alerts` on `users`.`id`=`alerts`.`memid`

+				inner join `notary` on `users`.`id`=`notary`.`to`

+			WHERE 	(`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)

+			GROUP BY `users`.`id`

+			HAVING `distance` <= '$maxdist' 

+			ORDER BY `distance` ";

+	 echo $query;

+

+    // comment next line when starting to send mail not only to me 

+    //	$query = "select * from `users` where `email` like 'cacerttest%'";

+

+	$res = mysql_query($query);

+	$xrows = mysql_num_rows($res);

+

+	while($row = mysql_fetch_assoc($res))

+	{

+    //    uncomment next line to send mails ...

+		sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);

+	}

+  // 1x cc to events.cacert.org

+	sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);

+	// 1x mailing report to events.cacert.org

+  sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);	

+

+	// 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1

+  sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);	

+	echo "invitation sent to $xrows recipients.\n";

+	

+?>

diff --git a/scripts/db_migrations/version2.sh b/scripts/db_migrations/version2.sh
index 7d940ff..7d940ff 100644..100755
--- a/scripts/db_migrations/version2.sh
+++ b/scripts/db_migrations/version2.sh