From 725cf3b784f48eb0911dbd3c3c885f99e96d96a4 Mon Sep 17 00:00:00 2001 From: Stefan Paletta Date: Mon, 4 Dec 2006 11:11:00 +0000 Subject: [PATCH] Stefan Paletta: update gnupg2 stack for gnupg 2.0.0 [2006111715145229941] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8075 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/a-tui/libgpg-error/libgpg-error.desc | 7 +- package/base/gnupg2/gnupg2.conf | 26 --- package/base/gnupg2/gnupg2.desc | 4 +- package/base/gnupg2/pkgdatadir-compat.patch | 211 +++++++++++++++++++ package/daja77/libassuan/libassuan.desc | 7 +- package/daja77/libksba/libksba.desc | 7 +- package/mathieu/libgcrypt/libgcrypt.desc | 7 +- package/stf/dirmngr/dirmngr.desc | 6 +- 8 files changed, 232 insertions(+), 43 deletions(-) delete mode 100644 package/base/gnupg2/gnupg2.conf create mode 100644 package/base/gnupg2/pkgdatadir-compat.patch diff --git a/package/a-tui/libgpg-error/libgpg-error.desc b/package/a-tui/libgpg-error/libgpg-error.desc index a03c87a4b..ace530309 100644 --- a/package/a-tui/libgpg-error/libgpg-error.desc +++ b/package/a-tui/libgpg-error/libgpg-error.desc @@ -35,8 +35,9 @@ [F] CORE [L] GPL -[S] Alpha -[V] 1.0 +[S] Stable +[V] 1.4 [P] X -?---5---9 115.700 -[D] 3614462627 libgpg-error-1.0.tar.gz ftp://ftp.gnupg.org/gcrypt/libgpg-error/ +[D] 1324493323 libgpg-error-1.4.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgpg-error/ + diff --git a/package/base/gnupg2/gnupg2.conf b/package/base/gnupg2/gnupg2.conf deleted file mode 100644 index a7a5824c2..000000000 --- a/package/base/gnupg2/gnupg2.conf +++ /dev/null @@ -1,26 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gnupg2/gnupg2.conf -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -# only build the tools needed for kmail integration -# to not break stable gnupg -var_append confopt " " "--disable-gpg" diff --git a/package/base/gnupg2/gnupg2.desc b/package/base/gnupg2/gnupg2.desc index 42d430074..048c8def0 100644 --- a/package/base/gnupg2/gnupg2.desc +++ b/package/base/gnupg2/gnupg2.desc @@ -49,8 +49,8 @@ [L] GPL [S] Stable -[V] 1.9.20 +[V] 2.0.0 [P] X -?---5---9 160.200 -[D] 1190379236 gnupg-1.9.20.tar.bz2 ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/ +[D] 727491167 gnupg-2.0.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/gnupg/ diff --git a/package/base/gnupg2/pkgdatadir-compat.patch b/package/base/gnupg2/pkgdatadir-compat.patch new file mode 100644 index 000000000..6c4e66948 --- /dev/null +++ b/package/base/gnupg2/pkgdatadir-compat.patch @@ -0,0 +1,211 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/gnupg2/pkgdatadir-compat.patch +# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +diff -ur ../gnupg-2.0.0.orig/agent/Makefile.in ./agent/Makefile.in +--- ../gnupg-2.0.0.orig/agent/Makefile.in 2006-11-11 14:45:48.000000000 +0100 ++++ ./agent/Makefile.in 2006-11-17 15:01:34.530095155 +0100 +@@ -56,7 +56,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/common/Makefile.in ./common/Makefile.in +--- ../gnupg-2.0.0.orig/common/Makefile.in 2006-11-11 14:45:48.000000000 +0100 ++++ ./common/Makefile.in 2006-11-17 15:01:34.590088117 +0100 +@@ -38,7 +38,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/doc/Makefile.in ./doc/Makefile.in +--- ../gnupg-2.0.0.orig/doc/Makefile.in 2006-11-11 14:45:49.000000000 +0100 ++++ ./doc/Makefile.in 2006-11-17 15:01:34.702074980 +0100 +@@ -37,7 +37,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/g10/Makefile.in ./g10/Makefile.in +--- ../gnupg-2.0.0.orig/g10/Makefile.in 2006-11-11 14:45:49.000000000 +0100 ++++ ./g10/Makefile.in 2006-11-17 15:01:34.714073573 +0100 +@@ -57,7 +57,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/gl/Makefile.in ./gl/Makefile.in +--- ../gnupg-2.0.0.orig/gl/Makefile.in 2006-11-11 14:45:49.000000000 +0100 ++++ ./gl/Makefile.in 2006-11-17 15:01:34.598087179 +0100 +@@ -29,7 +29,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/include/Makefile.in ./include/Makefile.in +--- ../gnupg-2.0.0.orig/include/Makefile.in 2006-11-11 14:45:49.000000000 +0100 ++++ ./include/Makefile.in 2006-11-17 15:01:34.682077326 +0100 +@@ -16,7 +16,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/jnlib/Makefile.in ./jnlib/Makefile.in +--- ../gnupg-2.0.0.orig/jnlib/Makefile.in 2006-11-11 14:45:49.000000000 +0100 ++++ ./jnlib/Makefile.in 2006-11-17 15:01:34.646081549 +0100 +@@ -38,7 +38,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/kbx/Makefile.in ./kbx/Makefile.in +--- ../gnupg-2.0.0.orig/kbx/Makefile.in 2006-11-11 14:45:50.000000000 +0100 ++++ ./kbx/Makefile.in 2006-11-17 15:01:34.690076388 +0100 +@@ -38,7 +38,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/keyserver/Makefile.in ./keyserver/Makefile.in +--- ../gnupg-2.0.0.orig/keyserver/Makefile.in 2006-11-11 14:45:50.000000000 +0100 ++++ ./keyserver/Makefile.in 2006-11-17 15:01:34.666079203 +0100 +@@ -56,7 +56,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/m4/Makefile.in ./m4/Makefile.in +--- ../gnupg-2.0.0.orig/m4/Makefile.in 2006-11-11 14:45:50.000000000 +0100 ++++ ./m4/Makefile.in 2006-11-17 15:01:34.610085771 +0100 +@@ -16,7 +16,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/Makefile.in ./Makefile.in +--- ../gnupg-2.0.0.orig/Makefile.in 2006-11-11 14:45:52.000000000 +0100 ++++ ./Makefile.in 2006-11-17 15:01:34.638082487 +0100 +@@ -36,7 +36,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . +diff -ur ../gnupg-2.0.0.orig/scd/Makefile.in ./scd/Makefile.in +--- ../gnupg-2.0.0.orig/scd/Makefile.in 2006-11-11 14:45:51.000000000 +0100 ++++ ./scd/Makefile.in 2006-11-17 15:01:34.678077796 +0100 +@@ -56,7 +56,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/sm/Makefile.in ./sm/Makefile.in +--- ../gnupg-2.0.0.orig/sm/Makefile.in 2006-11-11 14:45:51.000000000 +0100 ++++ ./sm/Makefile.in 2006-11-17 15:01:34.550092809 +0100 +@@ -56,7 +56,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/tests/Makefile.in ./tests/Makefile.in +--- ../gnupg-2.0.0.orig/tests/Makefile.in 2006-11-11 14:45:51.000000000 +0100 ++++ ./tests/Makefile.in 2006-11-17 15:01:34.622084364 +0100 +@@ -45,7 +45,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +diff -ur ../gnupg-2.0.0.orig/tests/openpgp/Makefile.in ./tests/openpgp/Makefile.in +--- ../gnupg-2.0.0.orig/tests/openpgp/Makefile.in 2006-11-11 14:45:51.000000000 +0100 ++++ ./tests/openpgp/Makefile.in 2006-11-17 15:01:34.630083426 +0100 +@@ -36,7 +36,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = ../.. +diff -ur ../gnupg-2.0.0.orig/tools/Makefile.in ./tools/Makefile.in +--- ../gnupg-2.0.0.orig/tools/Makefile.in 2006-11-11 14:45:52.000000000 +0100 ++++ ./tools/Makefile.in 2006-11-17 15:01:34.542093747 +0100 +@@ -58,7 +58,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@2 + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. diff --git a/package/daja77/libassuan/libassuan.desc b/package/daja77/libassuan/libassuan.desc index 2f7da66e8..c854ddfe8 100644 --- a/package/daja77/libassuan/libassuan.desc +++ b/package/daja77/libassuan/libassuan.desc @@ -33,8 +33,9 @@ [F] CORE [L] GPL -[S] Alpha -[V] 0.6.10 +[S] Stable +[V] 1.0.0 [P] X -?---5---9 116.000 -[D] 3041126184 libassuan-0.6.10.tar.gz ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/ +[D] 3229164826 libassuan-1.0.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libassuan/ + diff --git a/package/daja77/libksba/libksba.desc b/package/daja77/libksba/libksba.desc index 44d0d5395..6fd6f65aa 100644 --- a/package/daja77/libksba/libksba.desc +++ b/package/daja77/libksba/libksba.desc @@ -32,8 +32,9 @@ [F] CORE [L] GPL -[S] Alpha -[V] 0.9.13 +[S] Stable +[V] 1.0.0 [P] X -?---5---9 116.100 -[D] 3733606052 libksba-0.9.13.tar.bz2 ftp://ftp.gnupg.org/GnuPG/alpha/libksba/ +[D] 2650578700 libksba-1.0.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libksba/ + diff --git a/package/mathieu/libgcrypt/libgcrypt.desc b/package/mathieu/libgcrypt/libgcrypt.desc index b1810e810..100e4dda1 100644 --- a/package/mathieu/libgcrypt/libgcrypt.desc +++ b/package/mathieu/libgcrypt/libgcrypt.desc @@ -42,8 +42,9 @@ [F] CORE [L] GPL -[S] Alpha -[V] 1.2.1 +[S] Stable +[V] 1.2.3 [P] X -?---5---9 115.800 -[D] 816221443 libgcrypt-1.2.1.tar.gz ftp://ftp.gnupg.org/gcrypt/libgcrypt/ +[D] 2863918289 libgcrypt-1.2.3.tar.gz ftp://ftp.gnupg.org/gcrypt/libgcrypt/ + diff --git a/package/stf/dirmngr/dirmngr.desc b/package/stf/dirmngr/dirmngr.desc index 1a7602bb4..3c483babe 100644 --- a/package/stf/dirmngr/dirmngr.desc +++ b/package/stf/dirmngr/dirmngr.desc @@ -35,9 +35,9 @@ [C] extra/network [L] GPL -[S] Stable -[V] 0.9.3 +[S] Beta +[V] 0.9.6 [P] X -?---5---9 228.900 -[D] 91342156 dirmngr-0.9.3.tar.bz2 http://gd.tuwien.ac.at/privacy/gnupg/alpha/dirmngr/ +[D] 2397398751 dirmngr-0.9.6.tar.bz2 ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/