jaromail

a commandline tool to easily and privately handle your e-mail
git clone git://parazyd.org/jaromail.git
Log | Files | Refs | Submodules | README

commit c31ea725db8717363d48c57cdaee54864b5610f9
parent f2247dcc664b7367f4788d619f9b2b2e979c7bd6
Author: Jaromil <jaromil@dyne.org>
Date:   Sun, 25 Jan 2015 13:09:59 +0100

added emlx2maildir to extras and moved abquery to extras

Diffstat:
Aextras/emlx2maildir/ChangeLog | 98+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Aextras/emlx2maildir/LICENSE | 18++++++++++++++++++
Aextras/emlx2maildir/README | 30++++++++++++++++++++++++++++++
Aextras/emlx2maildir/emlx2maildir.py | 223+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Aextras/emlx2maildir/gpl-2.0.txt | 279+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mextras/gnupg-mass-recv/gnupg-mass-recv | 4++--
Rsrc/ABQuery/ABQuery.m -> extras/osx-abquery/ABQuery.m | 0
Rsrc/ABQuery/ABQuery_Prefix.h -> extras/osx-abquery/ABQuery_Prefix.h | 0
Rsrc/ABQuery/lbdb-ABQuery.xcodeproj/project.pbxproj -> extras/osx-abquery/lbdb-ABQuery.xcodeproj/project.pbxproj | 0
Rsrc/ABQuery/lbdb-ABQuery.xcodeproj/project.xcworkspace/contents.xcworkspacedata -> extras/osx-abquery/lbdb-ABQuery.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 0
Rsrc/ABQuery/lbdb-ABQuery.xcodeproj/project.xcworkspace/xcuserdata/jaromil.xcuserdatad/UserInterfaceState.xcuserstate -> extras/osx-abquery/lbdb-ABQuery.xcodeproj/project.xcworkspace/xcuserdata/jaromil.xcuserdatad/UserInterfaceState.xcuserstate | 0
Rsrc/ABQuery/lbdb-ABQuery.xcodeproj/xcuserdata/jaromil.xcuserdatad/xcschemes/lbdb-ABQuery.xcscheme -> extras/osx-abquery/lbdb-ABQuery.xcodeproj/xcuserdata/jaromil.xcuserdatad/xcschemes/lbdb-ABQuery.xcscheme | 0
Rsrc/ABQuery/lbdb-ABQuery.xcodeproj/xcuserdata/jaromil.xcuserdatad/xcschemes/xcschememanagement.plist -> extras/osx-abquery/lbdb-ABQuery.xcodeproj/xcuserdata/jaromil.xcuserdatad/xcschemes/xcschememanagement.plist | 0
13 files changed, 650 insertions(+), 2 deletions(-)

diff --git a/extras/emlx2maildir/ChangeLog b/extras/emlx2maildir/ChangeLog @@ -0,0 +1,98 @@ +commit fafd368a52de08c1d72507ae30377b1649fbbf9a +Author: Mike Laiosa <mike@laiosa.org> +Date: Fri May 17 08:52:25 2013 -0700 + + Make the usage slightly more useful + +commit 24f1cf432e89dbbb69577d7de527a86e229588d5 +Author: Mike Laiosa <mike@laiosa.org> +Date: Fri May 17 08:51:01 2013 -0700 + + Remove DOCTYPE from the plist XML. + + Remove DOCTYPE from the plist XML before feeding it to the parser, so it + doesn't try to download the DTD. This speeds things up, and makes it + more reliable + +commit 2cfdf826147660aeb63b8fd254446ab63b4a62be +Author: Mike Laiosa <mike@laiosa.org> +Date: Thu May 16 07:31:49 2013 -0700 + + Skip .emlx files that start with a . + + Based on feedback from https://github.com/cusco + +commit 7c3c8719adf0960fdc9915a171ceba685c994e09 +Author: Mike Laiosa <mike@laiosa.org> +Date: Mon Feb 18 21:01:02 2013 -0800 + + License under GPLv2+ + +commit 85a6effc542a206b91e9ec375ef48bc4dfe16caa +Author: Mike Laiosa <mike@laiosa.org> +Date: Mon Feb 18 20:54:33 2013 -0800 + + Remove a debugging print + +commit dba6780de524df970cd5ee5ce8a724b87778f431 +Merge: 10dfdab 1221d16 +Author: Mike Laiosa <mike@laiosa.org> +Date: Mon Feb 18 20:53:36 2013 -0800 + + Merge pull request #1 from tonklon/master + + Adapted to Lion - thanks tonklon. + +commit 1221d162700b532f2bfb8b1195015da50d3a6150 +Author: Tobias Klonk <tobias.klonk@tklonk.net> +Date: Thu Jan 12 14:36:29 2012 +0100 + + adapted to new mailbox layout + + Mail.app in OSX 10.7 Lion uses a new Mailbox layout that is split into + a much deeper folder hierarchy. + +commit 5e78448b57ecdaba63400eb86df84b22b89e96bc +Author: Tobias Klonk <tobias.klonk@tklonk.net> +Date: Thu Jan 12 14:23:31 2012 +0100 + + Enable deep Mailbox recursion + + The --recursive option did only go one level deep before. + +commit 10dfdabd6bea6431c70ab732a71e67dd6d424bf2 +Author: Mike Laiosa <mike@bullwinkle.socal.rr.com> +Date: Wed Mar 4 21:50:21 2009 -0800 + + Update the ctime of the file, because apperently some things care + +commit 0309cc4b70374312df65dc7bd09eb67b6a56f41b +Author: Mike Laiosa <mike@bullwinkle.socal.rr.com> +Date: Sun Mar 1 13:48:15 2009 -0800 + + * handle trailing / better + * make Maildir subfolders correctly + +commit 6706be3cfd85696b4a00ec0f0f4438910277eff5 +Author: Mike Laiosa <mike@bullwinkle.socal.rr.com> +Date: Sat Feb 28 17:35:33 2009 -0800 + + All done + +commit 6eca1cca62bf949bfb5df8dcdb0eda3ab40898f5 +Author: Mike Laiosa <mike@bullwinkle.socal.rr.com> +Date: Sat Feb 28 16:58:36 2009 -0800 + + Can find emlx subfolders + +commit 37ffc28b19cada111d8ce5dc6b2f68f813951a0c +Author: Mike Laiosa <mike@bullwinkle.socal.rr.com> +Date: Sat Feb 28 16:00:16 2009 -0800 + + convert_one works + +commit bacda7b643c96669a5a0d1eafe35ca9a0e30539b +Author: Mike Laiosa <mike@bullwinkle.socal.rr.com> +Date: Sat Feb 28 14:54:31 2009 -0800 + + working plist parser, and lots else diff --git a/extras/emlx2maildir/LICENSE b/extras/emlx2maildir/LICENSE @@ -0,0 +1,18 @@ +emlx2maildir - Convert Apple Mail.app mailboxes to Maildir +Copyright (C) 2009-2013 Mike Laiosa <mike@laiosa.org> and others. + +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; either version 2 of the License, or +(at your option) any later version. + +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. + +A copy of the GNU General Public License can be found in gpl-2.0.txt diff --git a/extras/emlx2maildir/README b/extras/emlx2maildir/README @@ -0,0 +1,30 @@ +# emlx2maildir +## Convert Apple Mail.app mailboxes to Maildir +### by Mike Laiosa <mike@laiosa.org> and others. + +http://mike.laiosa.org/software/emlx2maildir/ + +# Usage + +``` +emlx2maildir.py ~/Library/Mail/Messages /tmp/newmaildir --recursive +``` + +# license + + +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; either version 2 of the License, or +(at your option) any later version. + +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. + +A copy of the GNU General Public License can be found in gpl-2.0.txt diff --git a/extras/emlx2maildir/emlx2maildir.py b/extras/emlx2maildir/emlx2maildir.py @@ -0,0 +1,223 @@ +#!/usr/bin/env python + +# Copyright (C) 2009-2013 Mike Laiosa <mike@laiosa.org> and others. +# +# 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; either version 2 +# of the License, or (at your option) any later version. +# +# 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. + +import optparse +import xml.sax, xml.sax.handler +import re, os, os.path, socket, time + +class PlistHandler(xml.sax.handler.ContentHandler): + def __init__(self): + xml.sax.handler.ContentHandler.__init__(self) + self.key = None + def set_top(k,v): + self.top = v + self.stack = [set_top] + def generate(self, value): + self.stack[-1](self.key, value) + def startElement(self, name, attrs): + self.elem = name + self.value = "" + if name == "array": + ar = [] + self.stack.append(ar) + self.stack.append(lambda k,v: ar.append(v)) + elif name == "dict": + d = {} + def add(k, v): + d[k] = v + self.stack.append(d) + self.stack.append(add) + def endElement(self, name): + if name == "string": + self.generate(self.value) + elif name == "integer": + self.generate(long(self.value)) + elif name == "real": + self.generate(float(self.value)) + elif name == "key": + self.key = self.value + elif name in ("dict", "array"): + x = self.stack[-2] + self.stack = self.stack[:-2] + self.generate(x) + elif name in ("plist", "data"): + pass + else: + print "Unknown tag: %s" % name + def characters(self, chars): + self.value += chars + +def parse_plist(plist_xml): + # Remove any DOCTYPE declarations, to stop the XML parser from trying to + # download the DTD. + plist_xml = re.sub(r'<!DOCTYPE.*?"\s*>', "", plist_xml) + p = PlistHandler() + xml.sax.parseString(plist_xml, p) + return p.top + +FL_READ = (1<<0) +FL_DELETED = (1<<1) +FL_ANSWERED = (1<<2) +FL_ENCRYPTED = (1<<3) +FL_FLAGGED = (1<<4) +FL_RECENT = (1<<5) +FL_DRAFT = (1<<6) +FL_INITIAL = (1<<7) +FL_FORWARDED = (1<<8) +FL_REDIRECTED = (1<<9) +FL_SIGNED = (1<<23) +FL_IS_JUNK = (1<<24) +FL_IS_NOT_JUNK = (1<<25) +FL_JUNK_LEVEL_RECORDED = (1<<29) +FL_HIGHLIGHT_IN_TOC = (1<<30) + +flag_mapping = [ + (FL_DRAFT, "D"), + (FL_FLAGGED, "F"), + ((FL_FORWARDED | FL_REDIRECTED), "P"), + (FL_ANSWERED, "R"), + (FL_READ, "S"), + (FL_DELETED, "T"), +] + +hostname = socket.gethostname() +pid = os.getpid() +gSeq = 0 + +def md_filename(date, flags): + global gSeq + gSeq += 1 + return "%d.M%dP%dQ%d.%s:2,%s" % (date, time.time(), pid, gSeq, hostname, flags) + +def convert_one(emlx_file, maildir): + contents = open(emlx_file, "rb").read() + boundry = contents.find("\x0a") + length = long(contents[:boundry]) + body = contents[boundry+1:boundry+1+length] + metadata = parse_plist(contents[boundry+1+length:]) + + flags = "" + if "flags" in metadata: + for fl, let in flag_mapping: + if metadata['flags'] & fl: + flags += let + + date = long(metadata.get('date-sent', time.time())) + filename = md_filename(date, flags) + tmp_name = os.path.join(maildir, "tmp", filename) + cur_name = os.path.join(maildir, "cur", filename) + open(tmp_name, "wb").write(body) + os.rename(tmp_name, cur_name) + os.utime(cur_name, (date,date)) + +def emlx_message_dir(emlx_dir): + msg_dir = os.path.join(emlx_dir + ".mbox", "Messages") + if not os.path.isdir(msg_dir): + msg_dir = os.path.join(emlx_dir + ".imapmbox", "Messages") + if not os.path.isdir(msg_dir): + return None + return msg_dir + +def emlx_message_dirs(emlx_dir): + for x in os.listdir(emlx_dir): + suffixes = [".sbd", ".mbox", ".imapmbox"] + search = True + for s in suffixes: + if x.endswith(s): + search = False + if x == "Messages": + msg_dir = os.path.join(emlx_dir,"Messages") + yield msg_dir + elif search: + subfolder = os.path.join(emlx_dir, x) + if os.path.isdir(subfolder): + print "Recursing into %r" % (subfolder) + for tmp in emlx_message_dirs(subfolder): + yield tmp + +def emlx_messages(emlx_dir): + if os.path.isdir(emlx_dir + ".mbox"): + for msg_dir in emlx_message_dirs(emlx_dir + ".mbox"): + for x in os.listdir(msg_dir): + if x.endswith(".emlx") and x[0] != '.': + yield os.path.join(msg_dir, x) + +def emlx_subfolders(emlx_dir): + if not os.path.isdir(emlx_dir): + if os.path.isdir(emlx_dir + ".sbd"): + emlx_dir = ".sbd" + else: + return + for x in os.listdir(emlx_dir): + suffixes = [".sbd", ".mbox", ".imapmbox"] + for s in suffixes: + if x.endswith(s): + subfolder = os.path.join(emlx_dir, x[:-len(s)]) + for tmp in emlx_subfolders(os.path.join(emlx_dir, x)): + yield tmp + yield subfolder + +def maildirmake(dir): + for s in ["cur", "new", "tmp"]: + if not os.path.exists(os.path.join(dir, s)): + os.makedirs(os.path.join(dir, s)) + +def remove_slash(s): + if len(s) and s[-1] == '/': + return s[:-1] + else: + return s + +def main(): + parser = optparse.OptionParser(usage="Usage: %prog [options] emlx_folder maildir") + parser.add_option("-r", "--recursive", action="store_true", help="Recurse into subfolders") + parser.add_option("-q", "--quiet", action="store_true", help="Only print error output") + parser.add_option("--dry-run", action="store_true", help="Don't do anything") + parser.add_option("--verbose", action="store_true", help="Displays lots of stuff") + opts, args = parser.parse_args() + + def P(s): + if not opts.quiet: + print s + def V(s): + if opts.dry_run or opts.verbose: + P(s) + + def dry(s, act, *args, **kwargs): + V(s) + if not opts.dry_run: + return act(*args, **kwargs) + + if len(args) != 2: + parser.error("Not enough arguments") + + tasks = [(remove_slash(args[0]), args[1] + '/')] + while len(tasks): + emlx_folder, maildir = tasks[-1] + + P("Converting %r -> %r" % (emlx_folder, maildir)) + tasks = tasks[:-1] + dry("Making maildir %r" % maildir, maildirmake, maildir) + for msg in emlx_messages(emlx_folder): + dry("Converting message %r" % msg, convert_one, msg, maildir) + if opts.recursive: + for f in emlx_subfolders(emlx_folder): + tasks.append((f, maildir + "." + os.path.basename(f))) + +if __name__ == "__main__": + main() diff --git a/extras/emlx2maildir/gpl-2.0.txt b/extras/emlx2maildir/gpl-2.0.txt @@ -0,0 +1,279 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + diff --git a/extras/gnupg-mass-recv/gnupg-mass-recv b/extras/gnupg-mass-recv/gnupg-mass-recv @@ -1,7 +1,7 @@ #!/usr/bin/env zsh -# uncomment to really download keys and modify the pub keyring -# DRYRUN=1 +# comment to really download keys and modify the pub keyring +DRYRUN=1 zmodload zsh/pcre diff --git a/src/ABQuery/ABQuery.m b/extras/osx-abquery/ABQuery.m diff --git a/src/ABQuery/ABQuery_Prefix.h b/extras/osx-abquery/ABQuery_Prefix.h diff --git a/src/ABQuery/lbdb-ABQuery.xcodeproj/project.pbxproj b/extras/osx-abquery/lbdb-ABQuery.xcodeproj/project.pbxproj diff --git a/src/ABQuery/lbdb-ABQuery.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/extras/osx-abquery/lbdb-ABQuery.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/src/ABQuery/lbdb-ABQuery.xcodeproj/project.xcworkspace/xcuserdata/jaromil.xcuserdatad/UserInterfaceState.xcuserstate b/extras/osx-abquery/lbdb-ABQuery.xcodeproj/project.xcworkspace/xcuserdata/jaromil.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ. diff --git a/src/ABQuery/lbdb-ABQuery.xcodeproj/xcuserdata/jaromil.xcuserdatad/xcschemes/lbdb-ABQuery.xcscheme b/extras/osx-abquery/lbdb-ABQuery.xcodeproj/xcuserdata/jaromil.xcuserdatad/xcschemes/lbdb-ABQuery.xcscheme diff --git a/src/ABQuery/lbdb-ABQuery.xcodeproj/xcuserdata/jaromil.xcuserdatad/xcschemes/xcschememanagement.plist b/extras/osx-abquery/lbdb-ABQuery.xcodeproj/xcuserdata/jaromil.xcuserdatad/xcschemes/xcschememanagement.plist