[Gpg4win-commits] r161 - in trunk: . doc doc/manual-de packages patches patches/gpa-0.7.2 src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 15 14:25:54 CET 2006
Author: werner
Date: 2006-02-15 14:25:53 +0100 (Wed, 15 Feb 2006)
New Revision: 161
Added:
trunk/doc/pkg-copyright.txt
trunk/patches/gpa-0.7.2/
trunk/patches/gpa-0.7.2/01-bin-open.patch
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/NEWS
trunk/README
trunk/TODO
trunk/configure.ac
trunk/doc/ChangeLog
trunk/doc/Makefile.am
trunk/doc/README.de.txt
trunk/doc/README.en.txt
trunk/doc/manual-de/Makefile.am
trunk/packages/download.sh
trunk/packages/packages.current
trunk/src/Makefile.am
Log:
About to release 0.7.0
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/ChangeLog 2006-02-15 13:25:53 UTC (rev 161)
@@ -1,3 +1,9 @@
+2006-02-15 Werner Koch <wk at gnupg.org>
+
+ Released 0.7.0.
+
+ * patches/gpa-0.7.2/01-bin-open.patch: New file.
+
2006-02-15 Marcus Brinkmann <marcus at g10code.de>
* patches/gpgme/03-w32-io.patch: New file.
@@ -3,4 +9,8 @@
* patches/gpgme-1.1.1-cvs1152/03-w32-io.patch: New file.
+2006-02-14 Werner Koch <wk at gnupg.org>
+
+ * README (Instructions): Add a list of required Debian packages.
+
2006-01-31 Werner Koch <wk at g10code.com>
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/Makefile.am 2006-02-15 13:25:53 UTC (rev 161)
@@ -31,4 +31,5 @@
patches/glib-2.9.2-wk1/01-giowin32.patch \
patches/glib-2.9.2-wk1/02-gspawn-w32.patch \
patches/sylpheed-claws-1.9.100cvs124/01-fix-plugin-dir.patch \
- patches/sylpheed-claws-1.9.100cvs124/02-std-plugins.patch
+ patches/sylpheed-claws-1.9.100cvs124/02-std-plugins.patch \
+ patches/gpa-0.7.2/01-bin-open.patch
\ No newline at end of file
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/NEWS 2006-02-15 13:25:53 UTC (rev 161)
@@ -1,7 +1,13 @@
-Noteworthy changes in version 0.6.1
+Noteworthy changes in version 0.7.0 (2006-02-15)
------------------------------------------------
+ * Finished Durchblicker manual.
+ * Install a list with copyright statements.
+
+ * Fix bugs in the individual packages.
+
+
Noteworthy changes in version 0.6.0 (2006-01-26)
------------------------------------------------
@@ -98,7 +104,7 @@
* Initial release.
-Copyright 2005 g10 Code GmbH
+Copyright 2005, 2006 g10 Code GmbH
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
Modified: trunk/README
===================================================================
--- trunk/README 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/README 2006-02-15 13:25:53 UTC (rev 161)
@@ -1,5 +1,6 @@
This is gpg4win - the GUI Installer Builder for W32.
+
Instructions:
=============
@@ -25,6 +26,25 @@
src/gpg4win-src-X.Y.Z.exe
+Basic requirements
+==================
+
+A decent POSIX system is required for building this software as well
+as GNU make. We are using Debian GNU/Linux (Sid), however it should
+work with current Testing (as of Februar 2006) too. It might work with
+Sarge - this has not been tested. To satisfy all needs of configure
+at least the following packages need to be installed:
+
+ mingw32
+ nsis
+ stow
+ unzip
+ texinfo
+ imagemagick
+ tetex-bin
+ gs-common
+
+
Adding new packages to the installer:
=====================================
@@ -52,6 +72,32 @@
and run configure as described above.
+Copyright
+=========
+
+The entire GPG4Win package is
+
+ Copyright (C) 2005, 2006 g10 Code GmbH
+
+ GPG4Win 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.
+
+ GPG4Win 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
+
+
+This file
+=========
+
Copyright 2005, 2006 g10 Code GmbH
This file is free software; as a special exception the author gives
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/TODO 2006-02-15 13:25:53 UTC (rev 161)
@@ -1,12 +1,5 @@
-*- outline -*-
-* Missing stuff
-** Create a text file to record the version numbers
- of all installed packages and distribute it with the .exe. If
- possible HTML formatted with links to the NEWS files of the
- packages.
-** Add gpg translations to the installer
-
* Build system
** Some versions of strip don't work.
Werner's GNU strip 2.15.91 20040904 is fine but
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/configure.ac 2006-02-15 13:25:53 UTC (rev 161)
@@ -24,8 +24,8 @@
# Remember to change the version number immediately *after* a release.
# Uncomment the my_iscvs macro for non-released code.
-m4_define(my_version, [0.6.1])
-m4_define(my_iscvs, yes)
+m4_define(my_version, [0.7.0])
+#m4_define(my_iscvs, yes)
AC_INIT([gpg4win], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit(
[$Revision$],[Ra-z $:])]),
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/doc/ChangeLog 2006-02-15 13:25:53 UTC (rev 161)
@@ -1,3 +1,7 @@
+2006-02-15 Werner Koch <wk at gnupg.org>
+
+ * pkg-copyright.txt: New.
+
2006-02-12 Werner Koch <wk at g10code.com>
* manual-de/durchblicker.tex: Finished first rework.
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/doc/Makefile.am 2006-02-15 13:25:53 UTC (rev 161)
@@ -17,6 +17,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-EXTRA_DIST = nsi-mode.el README.en.txt README.de.txt
+EXTRA_DIST = nsi-mode.el README.en.txt README.de.txt pkg-copyright.txt
SUBDIRS = logo manual-de website
Modified: trunk/doc/README.de.txt
===================================================================
--- trunk/doc/README.de.txt 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/doc/README.de.txt 2006-02-15 13:25:53 UTC (rev 161)
@@ -10,9 +10,10 @@
Dies ist GnuPG for Windows, Version !VERSION!.
+Informationen zur Benutzung sind den Handbüchern "Gpg4Win für
+Einsteiger" und "Gpg4Win für Durchblicker" zu entnehmen.
-
Versionsnummern der einzenen Bestandteile
=========================================
@@ -21,17 +22,35 @@
+
+ Liste der Änderungen an Gpg4Win
+ =================================
+ (englische NEWS Datei)
+
+!NEWSFILE!
+
+
Rechtliche Hinweise zu den einzelnen Bestandteilen der Software
=================================================================
+Gpw4win besteht aus einer ganzen Reihe von unabhängig entwickelten
+Packeten, die teilweise unterschiedliche Lizenzen haben. Der Großteil
+dieser Software ist, wie Gpg4win selbst, steht unter der GNU General
+Public License (GNU GPL). Gemeinsam ist allen, daß die Software ohne
+Restriktionen benutzt werden kann, verändert werden darf und
+Änderungen weitergeben dürfen. Wenn die Quelltexte (also
+gpg4win-src-x.y.z.exe) mit weitergegeben werden und auf die die GNU
+GPL hingewiesen wird, ist die Weitergabe in jedem Fall möglich.
+Zur Übersicht folgt eine Liste der Copyright Erklärungen.
- Liste der Änderungen an Gpg4Win
- =================================
- (englische NEWS Datei)
+!PKG-COPYRIGHT!
-!NEWSFILE!
+Frohes GiPiGien,
+ Ihr Gpg4Win Team
+
+
*** Ende der Datei ***
Modified: trunk/doc/README.en.txt
===================================================================
--- trunk/doc/README.en.txt 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/doc/README.en.txt 2006-02-15 13:25:53 UTC (rev 161)
@@ -3,20 +3,47 @@
;; column are considered a comment and not included in the actually
;; installed version. Certain keywords are replaced by the Makefile;
;; those words are enclosed by exclamation marks.
-English README file for Gpg4Win
-================================
-Bla bla
+ English README file for Gpg4Win
+ ================================
+This is GnuPG for Windows, vesion !VERSION!.
-Version numbers of included software:
+ Version Numbers of Included Software
+ ====================================
+
!VERSIONINFO!
+ Record of Changes (NEWS file)
+ =================================
+!NEWSFILE!
+
+
+ Legal notices pertaining to the individual packets
+ ==================================================
+
+Gpg4win consist of several independent developed packages, available
+under different license conditions. Most of these packages however
+are available under the GNU General Public License (GNU GPL). Common
+to all is that they are free to use without restrictions, may be
+modified and that modifications may be distributed. If the source
+files (i.e. gpg4win-src-x.y.z.exe) are distributed along with the
+binaries and the use of the GNU GPL has been pointed out, distribution
+is in in all cases possible.
+
+What follows is a list of copyright statements.
+
+!PKG-COPYRIGHT!
+
+
+
+
Happy GiPiGing,
Your Gpg4Win Team
+ ***end of file ***
\ No newline at end of file
Modified: trunk/doc/manual-de/Makefile.am
===================================================================
--- trunk/doc/manual-de/Makefile.am 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/doc/manual-de/Makefile.am 2006-02-15 13:25:53 UTC (rev 161)
@@ -55,7 +55,7 @@
EXTRA_DIST = fdl.tex einsteiger.tex durchblicker.tex $(eps_files) \
$(png_files) \
- was-ist-gpg4win.text macros.tex version.tex.in gpg4win-logo.eps
+ was-ist-gpg4win.tex macros.tex version.tex.in gpg4win-logo.eps
CLEANFILES = $(eps_files_bb) $(png_files_eps) \
*.pdf *.pdf *.toc *.log *.aux *.out
Added: trunk/doc/pkg-copyright.txt
===================================================================
--- trunk/doc/pkg-copyright.txt 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/doc/pkg-copyright.txt 2006-02-15 13:25:53 UTC (rev 161)
@@ -0,0 +1,246 @@
+Here is a list with collected copyright notices. For details see the
+description of each individual package. [Compiled by wk 2006-02-15]
+
+Gpw4Win is
+
+ Copyright (C) 2005, 2006 g10 Code GmbH
+
+ GPG4Win 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.
+
+ GPG4Win 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
+
+
+GnuPG is
+
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006 Free Software Foundation, Inc.
+
+ GnuPG 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.
+
+ GnuPG 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
+
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GnuPG.
+
+
+NSIS is
+
+ Copyright (C) 1999-2005 Nullsoft, Inc.
+
+ This license applies to everything in the NSIS package, except where
+ otherwise noted.
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+ The user interface used with the installer is
+
+ Copyright (C) 2002-2005 Joost Verburg
+
+ [It is distributed along with NSIS and the same conditions as stated
+ above apply]
+
+
+GLIB is
+
+ Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+ Modified by the GLib Team and others 1997-2000. See the AUTHORS
+ file for a list of people on the GLib Team. See the ChangeLog
+ files for a list of changes. These files are distributed with
+ GLib at ftp://ftp.gtk.org/pub/gtk/.
+
+
+GPA is
+
+ Copyright (C) 2000-2002 G-N-U GmbH (http://www.g-n-u.de)
+ Copyright (C) 2002-2003 Miguel Coca.
+ Copyright (C) 2005 g10 Code GmbH.
+
+ GPA uses fragments from the following programs and libraries:
+ JNLIB, Copyright (C) 1998-2000 Free Software Foundation, Inc.
+ GPGME, Copyright (C) 2000-2001 Werner Koch
+ WinPT, Copyright (C) 2000-2002 Timo Schulz
+ (For details, see the file `AUTHORS'.)
+
+ GPA 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.
+
+ GPA 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 GPA; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+GPGME is
+
+ Copyright (C) 2000 Werner Koch (dd9jn)
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
+
+ GPGME is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ GPGME 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA. */
+
+
+GPGol is
+
+ Copyright (C) 2001 G Data Software AG, http://www.gdata.de
+ Copyright (C) 2004, 2005 g10 Code GmbH
+
+ GPGol is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ GPGol 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser 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.
+
+
+LIBGPG-ERROR is
+
+ Copyright (C) 2003, 2004 g10 Code GmbH
+
+ libgpg-error is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ libgpg-error 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with libgpg-error; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA. */
+
+
+Pthreads-win32 is
+
+ Copyright(C) 1998 John E. Bossom
+ Copyright(C) 1999,2002 Pthreads-win32 contributors
+
+ Most of this is work available under the GNU Lesser General Public
+ License as published by the Free Software Foundation version 2.1 of
+ the License. The detailed terms are given in the file COPYING in
+ the source distribution; that very file may not be modified and thus
+ it is not possible to include it here.
+
+
+Sylpheed-Claws is
+
+ Copyright(C) 1999-2005 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> and the
+ Sylpheed-Claws Team
+
+ 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, 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.
+
+
+WinPT is
+
+ Copyright (C) 2000-2006 Timo Schulz
+
+ WinPT 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.
+
+ WinPT 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 WinPT; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
Modified: trunk/packages/download.sh
===================================================================
--- trunk/packages/download.sh 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/packages/download.sh 2006-02-15 13:25:53 UTC (rev 161)
@@ -39,16 +39,24 @@
force=yes
shift
fi
+keep_list=no
+if [ "$1" = "--keep-list" ]; then
+ keep_list=yes
+ shift
+fi
WGET=wget
url="ftp://ftp.gpg4win.org/gpg4win/"
-echo "downloading packages list from \`$url'."
-if ! ${WGET} -N -q $url/packages.current{,.sig} ; then
- echo "download of packages list failed." >&2
- exit 1
+if [ "$keep_list" = "no" ]; then
+ echo "downloading packages list from \`$url'."
+ if ! ${WGET} -N -q $url/packages.current{,.sig} ; then
+ echo "download of packages list failed." >&2
+ exit 1
+ fi
fi
+
if ! gpgv --keyring ./packages.keys packages.current.sig packages.current
then
echo "list of packages is not usable." >&2
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/packages/packages.current 2006-02-15 13:25:53 UTC (rev 161)
@@ -127,8 +127,8 @@
#chk f880bd2103b51a8e2f6e94f58a9524c523765ccb
server ftp://ftp.g10code.com/g10code/scratch
-file winpt-0.11.7-cvs.tar.bz2
-chk 4f1229c776a2eef438dc97512b0882fbdfebbd81
+file winpt-0.11.8rc1.tar.bz2
+chk 4195420ba82c5852c7b30192fda2c6627e5b31fd
# GPGee
@@ -162,8 +162,8 @@
server ftp://ftp.gnupg.org/gcrypt
-file gnupg/gnupg-1.4.2.tar.gz
-chk cc7e9a5268bf309ac652a7343b62dff8cfb68d38
+file alpha/gnupg/gnupg-1.4.3rc1.tar.bz2
+chk 6c2d5f65c2acde6eaeb1ae3a4bc9ae971f942126
file alpha/gpa/gpa-0.7.1.tar.bz2
chk db850a43e69c6677765cbaf95718b930fe439612
Added: trunk/patches/gpa-0.7.2/01-bin-open.patch
===================================================================
--- trunk/patches/gpa-0.7.2/01-bin-open.patch 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/patches/gpa-0.7.2/01-bin-open.patch 2006-02-15 13:25:53 UTC (rev 161)
@@ -0,0 +1,71 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Use binary open mode for files.
+Fix keyserver list.
+
+
+2006-02-15 Werner Koch <wk at g10code.com>
+
+ * Fixed typo in keyserver list.
+
+2006-02-14 Marcus Brinkmann <marcus at g10code.de>
+
+ * gpgmetools.c (O_BINARY): Define if it isn't defined by system
+ headers.
+ (gpa_open_output): Use open() instead of creat() and set binary
+ mode.
+ (gpa_open_input): Set binary mode.
+
+
+
+Index: src/gpgmetools.c
+===================================================================
+--- src/gpgmetools.c (revision 738)
++++ src/gpgmetools.c (working copy)
+@@ -43,6 +43,12 @@
+ #include <windows.h>
+ #endif
+
++#ifndef O_BINARY
++#ifdef _O_BINARY
++#define O_BINARY _O_BINARY
++#else
++#define O_BINARY 0
++#endif
+
+ /* Report an unexpected error in GPGME and quit the application. */
+ void
+@@ -176,7 +182,7 @@
+ {
+ gpg_error_t err;
+
+- target = creat (filename, 0666);
++ target = open (filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
+ if (target == -1)
+ {
+ gchar *message;
+@@ -202,7 +208,7 @@
+ gpg_error_t err;
+ int target = -1;
+
+- target = open (filename, O_RDONLY);
++ target = open (filename, O_RDONLY | O_BINARY);
+ if (target == -1)
+ {
+ gchar *message;
+Index: src/keyserver.c
+===================================================================
+--- src/keyserver.c (revision 739)
++++ src/keyserver.c (working copy)
+@@ -169,7 +169,7 @@
+ add_server (&serverlist, "hkp://random.sks.keyserver.penguin.de");
+ add_server (&serverlist, "hkp://blackhole.pca.dfn.de");
+ add_server (&serverlist, "hkp://pks.gpg.cz");
+- add_server (&serverlist, "hpk://pgp.cns.ualberta.ca");
++ add_server (&serverlist, "hkp://pgp.cns.ualberta.ca");
+ add_server (&serverlist, "hkp://minsky.surfnet.nl");
+ add_server (&serverlist, "hkp://keyserver.ubuntu.com");
+ add_server (&serverlist, "hkp://keyserver.pramberger.at");
+
Property changes on: trunk/patches/gpa-0.7.2/01-bin-open.patch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2006-02-15 12:48:01 UTC (rev 160)
+++ trunk/src/Makefile.am 2006-02-15 13:25:53 UTC (rev 161)
@@ -198,13 +198,17 @@
README.en.txt : versioninfo.txt $(top_srcdir)/doc/README.en.txt
sed -e '/^;.*/d;/!VERSIONINFO!/{r versioninfo.txt' -e 'd;}' \
+ -e '/!NEWSFILE!/{r $(top_srcdir)/NEWS' -e 'd;}' \
+ -e '/!PKG-COPYRIGHT!/{r $(top_srcdir)/doc/pkg-copyright.txt' -e 'd;}' \
+ -e 's,!VERSION!,$(VERSION),g' \
< $(top_srcdir)/doc/README.en.txt \
| awk '{printf "%s\r\n", $$0}' >README.en.txt
README.de.txt : versioninfo.txt $(top_srcdir)/doc/README.de.txt
sed -e '/^;.*/d;/!VERSIONINFO!/{r versioninfo.txt' -e 'd;}' \
- -e '/!NEWSFILE!/{r $(top_srcdir)/NEWS' -e 'd;}' \
- -e 's,!VERSION!,$(VERSION),g' \
+ -e '/!NEWSFILE!/{r $(top_srcdir)/NEWS' -e 'd;}' \
+ -e '/!PKG-COPYRIGHT!/{r $(top_srcdir)/doc/pkg-copyright.txt' -e 'd;}' \
+ -e 's,!VERSION!,$(VERSION),g' \
< $(top_srcdir)/doc/README.de.txt \
| awk '{printf "%s\r\n", $$0}' >README.de.txt
More information about the Gpg4win-commits
mailing list