Browse Source
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-bff59a50e3bcrocklinux
Stefan Paletta
21 years ago
7 changed files with 11 additions and 111 deletions
Unified View
Diff Options
-
+3 -2package/base/file/file.desc
-
+0 -63package/base/gnupg/disable_elgamal.patch
-
+2 -2package/base/gnupg/gnupg.desc
-
+0 -38package/base/ltrace/doc-dir.patch
-
+2 -2package/base/ltrace/ltrace.desc
-
+2 -2package/rene/k3b/k3b.desc
-
+2 -2package/rene/xpdf/xpdf.desc
@ -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; |
|
||||
@ -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: |
|
||||