From 1c462298333a243f4f9acc6455df128953eb7935 Mon Sep 17 00:00:00 2001 From: Stefan Paletta Date: Tue, 20 Jan 2004 23:30:54 +0000 Subject: [PATCH] Stefan Paletta: updated k3b (0.10.3), xpdf (2.03), gnupg (1.2.4), file (4.07) updated ltrace (0.3.31) - including not to use the Debian potato repository) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2259 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/file/file.desc | 5 +- package/base/gnupg/disable_elgamal.patch | 63 ------------------------ package/base/gnupg/gnupg.desc | 4 +- package/base/ltrace/doc-dir.patch | 38 -------------- package/base/ltrace/ltrace.desc | 4 +- package/rene/k3b/k3b.desc | 4 +- package/rene/xpdf/xpdf.desc | 4 +- 7 files changed, 11 insertions(+), 111 deletions(-) delete mode 100644 package/base/gnupg/disable_elgamal.patch delete mode 100644 package/base/ltrace/doc-dir.patch diff --git a/package/base/file/file.desc b/package/base/file/file.desc index eca40a479..b745a739e 100644 --- a/package/base/file/file.desc +++ b/package/base/file/file.desc @@ -28,14 +28,15 @@ [T] the types of various files. [A] Ian Darwin +[A] Christos Zoulas [M] Clifford Wolf [C] base/tool [L] BSD [S] Stable -[V] 4.06 +[V] 4.07 [P] X -----5---9 199.000 -[D] 1577559619 file-4.06.tar.gz ftp://ftp.fu-berlin.de/unix/tools/file/ +[D] 1950209003 file-4.07.tar.gz ftp://ftp.astron.com/pub/file/ diff --git a/package/base/gnupg/disable_elgamal.patch b/package/base/gnupg/disable_elgamal.patch deleted file mode 100644 index 00dbd5b62..000000000 --- a/package/base/gnupg/disable_elgamal.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -pruN gnupg-1.2.3_orig/g10/getkey.c gnupg-1.2.3/g10/getkey.c ---- gnupg-1.2.3_orig/g10/getkey.c 2003-11-27 14:27:05.000000000 +0100 -+++ gnupg-1.2.3/g10/getkey.c 2003-11-27 14:27:10.000000000 +0100 -@@ -1655,6 +1655,11 @@ merge_selfsigs_main( KBNODE keyblock, in - if ( x ) /* mask it down to the actual allowed usage */ - key_usage &= x; - } -+ -+ /* Type 20 Elgamal keys are not usable. */ -+ if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) -+ key_usage=0; -+ - pk->pubkey_usage = key_usage; - - if ( !key_expire_seen ) { -@@ -1869,6 +1874,13 @@ merge_selfsigs_subkey( KBNODE keyblock, - if ( x ) /* mask it down to the actual allowed usage */ - key_usage &= x; - } -+ -+ /* Type 20 Elgamal subkeys or any subkey on a type 20 primary are -+ not usable. */ -+ if(mainpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL -+ || subpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) -+ key_usage=0; -+ - subpk->pubkey_usage = key_usage; - - p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE, NULL); -diff -pruN gnupg-1.2.3_orig/g10/keygen.c gnupg-1.2.3/g10/keygen.c ---- gnupg-1.2.3_orig/g10/keygen.c 2003-11-27 14:27:05.000000000 +0100 -+++ gnupg-1.2.3/g10/keygen.c 2003-11-27 14:27:10.000000000 +0100 -@@ -958,8 +958,6 @@ ask_algo (int addmode, unsigned int *r_u - tty_printf( _(" (%d) DSA (sign only)\n"), 2 ); - if( addmode ) - tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 ); -- if (opt.expert) -- tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 ); - tty_printf( _(" (%d) RSA (sign only)\n"), 5 ); - if (addmode) - tty_printf( _(" (%d) RSA (encrypt only)\n"), 6 ); -@@ -990,21 +988,6 @@ ask_algo (int addmode, unsigned int *r_u - *r_usage = PUBKEY_USAGE_SIG; - break; - } -- else if( algo == 4 && opt.expert) -- { -- tty_printf(_( --"The use of this algorithm is only supported by GnuPG. You will not be\n" --"able to use this key to communicate with PGP users. This algorithm is also\n" --"very slow, and may not be as secure as the other choices.\n")); -- -- if( cpr_get_answer_is_yes("keygen.algo.elg_se", -- _("Create anyway? "))) -- { -- algo = PUBKEY_ALGO_ELGAMAL; -- *r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG; -- break; -- } -- } - else if( algo == 3 && addmode ) { - algo = PUBKEY_ALGO_ELGAMAL_E; - *r_usage = PUBKEY_USAGE_ENC; diff --git a/package/base/gnupg/gnupg.desc b/package/base/gnupg/gnupg.desc index 615fe3451..7fce3d210 100644 --- a/package/base/gnupg/gnupg.desc +++ b/package/base/gnupg/gnupg.desc @@ -48,10 +48,10 @@ [L] GPL [S] Stable -[V] 1.2.3 +[V] 1.2.4 [P] X -----5---9 262.000 [SRC] pg -[D] 3589481763 gnupg-1.2.3.tar.gz ftp://ftp.gnupg.org/gcrypt/gnupg/ +[D] 3841770975 gnupg-1.2.4.tar.gz ftp://ftp.gnupg.org/gcrypt/gnupg/ [D] 3598666848 pgpgpg-0.13.tar.gz http://www.nessie.de/mroth/pgpgpg/ diff --git a/package/base/ltrace/doc-dir.patch b/package/base/ltrace/doc-dir.patch deleted file mode 100644 index f514f7265..000000000 --- a/package/base/ltrace/doc-dir.patch +++ /dev/null @@ -1,38 +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/ltrace/doc-dir.patch -# ROCK Linux is Copyright (C) 1998 - 2003 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 --- - ---- ./Makefile.in.orig Sun Aug 29 23:49:23 1999 -+++ ./Makefile.in Sat Mar 25 09:18:51 2000 -@@ -40,11 +40,11 @@ - ( cd .. ; tar zcvf ltrace-`date +%y%m%d`.tgz ltrace ) - - install: ltrace -- @INSTALL@ -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/doc/ltrace $(DESTDIR)/usr/share/man/man1 -+ @INSTALL@ -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/doc/packages/ltrace $(DESTDIR)/usr/share/man/man1 - @INSTALL@ -d $(DESTDIR)/etc - @INSTALL@ -s ltrace $(DESTDIR)/usr/bin - @INSTALL@ -m 644 etc/ltrace.conf $(DESTDIR)/etc -- @INSTALL@ -m 644 COPYING README TODO BUGS ChangeLog $(DESTDIR)/usr/doc/ltrace -+ @INSTALL@ -m 644 COPYING README TODO BUGS ChangeLog $(DESTDIR)/usr/doc/packages/ltrace - @INSTALL@ -m 644 ltrace.1 $(DESTDIR)/usr/share/man/man1 - - dummy: diff --git a/package/base/ltrace/ltrace.desc b/package/base/ltrace/ltrace.desc index 5dbf89707..60775cf92 100644 --- a/package/base/ltrace/ltrace.desc +++ b/package/base/ltrace/ltrace.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 0.3.10 +[V] 0.3.31 [P] X ---3-----9 134.000 -[D] 2710752131 ltrace_0.3.10.tar.gz ftp://ftp.debian.org/debian/dists/potato/main/source/utils/ +[D] 2778527375 ltrace_0.3.31.tar.gz http://ftp.debian.org/debian/pool/main/l/ltrace/ diff --git a/package/rene/k3b/k3b.desc b/package/rene/k3b/k3b.desc index af185a314..3fab73653 100644 --- a/package/rene/k3b/k3b.desc +++ b/package/rene/k3b/k3b.desc @@ -37,11 +37,11 @@ [L] GPL [S] Beta -[V] 0.10.2 +[V] 0.10.3 [P] X -----5---9 632.000 [SRC] k3b -[D] 1593667522 k3b-0.10.2.tar.gz http://dl.sourceforge.net/sourceforge/k3b/ +[D] 1513546298 k3b-0.10.3.tar.gz http://dl.sourceforge.net/sourceforge/k3b/ [D] 2630951371 k3b-i18n-0.10.tar.gz http://dl.sourceforge.net/sourceforge/k3b/ diff --git a/package/rene/xpdf/xpdf.desc b/package/rene/xpdf/xpdf.desc index d88ea27f9..b8a96667d 100644 --- a/package/rene/xpdf/xpdf.desc +++ b/package/rene/xpdf/xpdf.desc @@ -35,9 +35,9 @@ [L] GPL [S] Stable -[V] 2.02 +[V] 2.03 [P] X -------7-9 373.000 -[D] 2862574398 xpdf-2.02.tar.gz ftp://ftp.foolabs.com/pub/xpdf/ +[D] 2146086023 xpdf-2.03.tar.gz ftp://ftp.foolabs.com/pub/xpdf/ [D] 5395543 t1lib-1.3.tar.gz ftp://ftp.foolabs.com/pub/xpdf/