[Gpg4win-commits] r485 - in trunk: . doc include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Aug 20 15:58:59 CEST 2007
Author: werner
Date: 2007-08-20 15:58:58 +0200 (Mon, 20 Aug 2007)
New Revision: 485
Added:
trunk/src/inst-bzip2.nsi
trunk/src/uninst-bzip2.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/doc/ChangeLog
trunk/doc/pkg-copyright.txt
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
Log:
Add explicit support for BZIP2.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/ChangeLog 2007-08-20 13:58:58 UTC (rev 485)
@@ -1,3 +1,17 @@
+2007-08-20 Werner Koch <wk at g10code.com>
+
+ * packages/packages.current: Add bzip2.
+
+ * configure.ac: Check for RANLIB and AR. Look for bzip2. Make
+ gnupg and gnupg2 depend on it.
+ * src/Makefile.am (gpg4win_pkg_bzip2_make_args)
+ (gpg4win_pkg_bzip2_make_args_inst): New.
+ (EXTRA_DIST): Add bzip2.
+ (gpg4win_pkg_gnupg_configure): New. Look for bzip2.
+ * include/config.nsi.in: Add bzip2.
+ * src/inst-bzip2.nsi: New.
+ * src/uninst-bzip2.nsi: New.
+
2007-08-16 Werner Koch <wk at g10code.com>
Released 1.1.2.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/configure.ac 2007-08-20 13:58:58 UTC (rev 485)
@@ -127,6 +127,8 @@
# Required tools.
AC_PROG_CC
AC_PROG_CPP
+AC_PROG_RANLIB
+AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_TOOLS(STRIP, strip)
AC_CHECK_TOOLS(DLLTOOL, dlltool)
AC_CHECK_PROGS(MAKE, make)
@@ -182,6 +184,7 @@
GPG4WIN_BPKG_BINSRC([GPGee], [gnupg])
+GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
GPG4WIN_SPKG([libgcrypt], [libgpg-error])
GPG4WIN_SPKG([libksba], [libgpg-error])
@@ -190,9 +193,9 @@
GPG4WIN_SPKG([w32pth])
GPG4WIN_SPKG([pinentry], [libiconv])
GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
-GPG4WIN_SPKG([gnupg], [libiconv])
+GPG4WIN_SPKG([gnupg], [libiconv bzip2])
GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
- w32pth zlib])
+ w32pth zlib bzip2])
GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([pinentry])
GPG4WIN_SPKG([gpgol], [gpgme])
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/doc/ChangeLog 2007-08-20 13:58:58 UTC (rev 485)
@@ -1,3 +1,7 @@
+2007-08-20 Werner Koch <wk at g10code.com>
+
+ * pkg-copyright.txt: Add bzip2 Updated Claws as it is now GPLv3+.
+
2007-08-17 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
* website/package-integrity.htm4,
Modified: trunk/doc/pkg-copyright.txt
===================================================================
--- trunk/doc/pkg-copyright.txt 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/doc/pkg-copyright.txt 2007-08-20 13:58:58 UTC (rev 485)
@@ -211,20 +211,22 @@
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)
+ the Free Software Foundation; either version 3, 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.
+ 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.
+ For more details see the file COPYING.
+
WinPT is
Copyright (C) 2000-2006 Timo Schulz
@@ -243,4 +245,43 @@
along with WinPT; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+BZIP2 is
+ This program, "bzip2", the associated library "libbzip2", and all
+ documentation, are copyright (C) 1996-2006 Julian R Seward. All
+ rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. 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.
+
+ 3. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ Julian Seward, Cambridge, UK.
+ jseward at bzip.org
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/include/config.nsi.in 2007-08-20 13:58:58 UTC (rev 485)
@@ -139,6 +139,10 @@
!define gpg4win_pkg_pthreads_w32 @gpg4win_pkg_pthreads_w32@
!define gpg4win_pkg_pthreads_w32_version @gpg4win_pkg_pthreads_w32_version@
+ at HAVE_PKG_BZIP2@
+!define gpg4win_pkg_bzip2 @gpg4win_pkg_bzip2@
+!define gpg4win_pkg_bzip2_version @gpg4win_pkg_bzip2_version@
+
@HAVE_PKG_LIBPNG@
!define gpg4win_pkg_libpng @gpg4win_pkg_libpng@
!define gpg4win_pkg_libpng_version @gpg4win_pkg_libpng_version@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/packages/packages.current 2007-08-20 13:58:58 UTC (rev 485)
@@ -214,7 +214,15 @@
file w32pth-2.0.1.tar.bz2
chk e74a770a58f08ba02f311d16c5debe79c218ee5d
+#
+# Stripped down version of BZIP2
+#
+server ftp://ftp.g10code.com/g10code/bzip2
+file bzip2-1.0.4-g10.tar.gz
+chk ae1b992721198b93198aa36eb7a3a7d074417f47
+
+
#
# GnuPG et al.
#
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/src/Makefile.am 2007-08-20 13:58:58 UTC (rev 485)
@@ -57,7 +57,8 @@
inst-sylpheed-claws.nsi uninst-sylpheed-claws.nsi \
inst-w32pth.nsi uninst-w32pth.nsi \
inst-winpt.nsi uninst-winpt.nsi \
- inst-zlib.nsi uninst-zlib.nsi
+ inst-zlib.nsi uninst-zlib.nsi \
+ inst-bzip2.nsi uninst-bzip2.nsi
@@ -128,6 +129,9 @@
--with-libassuan-prefix=$(idir) \
--with-pth-prefix=$(idir)
+gpg4win_pkg_gnupg_configure = \
+ --with-bzip2=$(idir)
+
gpg4win_pkg_gnupg2_configure = \
--with-gpg-error-prefix=$(idir) \
--with-ksba-prefix=$(idir) \
@@ -180,17 +184,23 @@
--disable-valgrind
# Supported make-only source packages.
-gpg4win_mpkgs = pthreads-w32
+gpg4win_mpkgs = pthreads-w32 bzip2
-# Extra options for the make infocations for individual packages.
-# make_flags is used fur building make_args_inst is used for installing.
+# Extra options for the make invocations for individual packages.
+# make_flags is used fur building, make_args_inst is used for installing.
gpg4win_pkg_pthreads_w32_make_args = \
prefix=$(idir) CROSS=$(host_alias)- clean GC-inlined
gpg4win_pkg_pthreads_w32_make_args_inst = \
prefix=$$$${pkgidir} CROSS=$(host_alias)-
+gpg4win_pkg_bzip2_make_args = \
+ CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
+gpg4win_pkg_bzip2_make_args_inst = \
+ PREFIX=$$$${pkgidir} CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
+
+
# Supported binary packages.
gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
atk gtk+ gpgee crypt regex
Added: trunk/src/inst-bzip2.nsi
===================================================================
--- trunk/src/inst-bzip2.nsi 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/src/inst-bzip2.nsi 2007-08-20 13:58:58 UTC (rev 485)
@@ -0,0 +1,39 @@
+# inst-bzip2.nsi - Installer snippet. -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# 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.
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/bzip2-${gpg4win_pkg_bzip2_version}
+
+!ifdef DEBUG
+Section "bzip2" SEC_bzip2
+!else
+Section "-bzip2" SEC_bzip2
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_bzip2}"
+!else
+ # Nothing to install as we link statically.
+!endif
+SectionEnd
+
Added: trunk/src/uninst-bzip2.nsi
===================================================================
--- trunk/src/uninst-bzip2.nsi 2007-08-17 22:05:02 UTC (rev 484)
+++ trunk/src/uninst-bzip2.nsi 2007-08-20 13:58:58 UTC (rev 485)
@@ -0,0 +1,36 @@
+# uninst-bzip2.nsi - Installer snippet. -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# 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.
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/bzip2-${gpg4win_pkg_bzip2_version}
+
+
+; Uninstaller section.
+Section "-un.bzip2"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_bzip2_src}"
+ Call un.SourceDelete
+!else
+ # Nothing to uninstall
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list