Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 200 → Rev 199

/trunk/debian/pike7.8-core.lintian-overrides
File deleted
/trunk/debian/pike7.8-core.links
File deleted
/trunk/debian/changelog
15,14 → 15,8
* bad_size_t_redef.patch: Fix undefined behaviour/buffer overruns in
module _Image_JPEG on 64-bit architectures due to broken redefinition
of size_t (Closes: #750430).
* Use dh_installdocs --link-doc to create doc symlinks in module
packages.
* Replace GPL and LGPL license texts used by Tools.Legal.License with
symlinks to corresponding files in /usr/share/common-licenses.
Override remaining Lintian warnings about GPL.pmod and LGPL.pmod,
which do not include the license texts themselves.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 02 Aug 2014 21:47:30 +0200
-- Magnus Holmgren <holmgren@debian.org> Sat, 02 Aug 2014 18:09:33 +0200
 
pike7.8 (7.8.866-1) experimental; urgency=low
 
/trunk/debian/rules
219,7 → 219,6
dh_install -i -N$(PIKE)-manual -N$(PIKE)-reference --sourcedir=$(TMP)
dh_installdocs -i
dh_installchangelogs -i -k CHANGES
dh_lintian -i
dh_link -i
dh_compress -i
dh_fixperms -i
235,13 → 234,12
dh_install -a -N$(PIKE)-core --sourcedir=debian/tmp $(DH_EXCLUDE)
dh_install -p$(PIKE)-core --sourcedir=debian/tmp $(DH_EXCLUDE) $(DH_ALREADY)
for p in $(MODULE_PACKAGES); do \
dh_link -p$$p usr/share/doc/$(PIKE)-core usr/share/doc/$$p; \
sed "s/#PACKAGE#/$$p/" debian/prerm-snippet >> debian/$$p.prerm.debhelper; \
done
dh_installdocs -a --link-doc=$(PIKE)-core
dh_installdocs -a
dh_installmenu -a
dh_installchangelogs -a -k CHANGES
dh_lintian -a
dh_link -a
dh_strip -a
dh_compress -a
dh_fixperms -a -X/run_autoconfig -X/precompile.sh -X/smartlink -X/fixdepends.sh -X/install_module -X/mktestsuite
/trunk/debian/patches/nettle_crypt_md5_buffer_size.patch
0,0 → 1,15
From: Arne Goedeke <el@laramies.com>
Subject: Nette.MD5: passwd array was too small
Origin: upstream, http://pike-librarian.lysator.liu.se/piff.xml?module=pike.git&file=src/post_modules/Nettle/crypt_md5.c&from=ef75d0301312d2d5603760772bcd09f16cd24c8a&to=2652ce0df4d39c09a57049b3ca0daf735b331e5b
 
--- a/src/post_modules/Nettle/crypt_md5.c
+++ b/src/post_modules/Nettle/crypt_md5.c
@@ -47,7 +47,7 @@ char *pike_crypt_md5(int pl, const char
* it this way, we can get
* better later on
*/
- static char passwd[22], *p;
+ static char passwd[23], *p;
unsigned char final[MD5_DIGEST_SIZE];
int i;
struct md5_ctx ctx;
/trunk/debian/patches/reg_enum_conflict.patch
0,0 → 1,117
Description: Rename enum constants in src/code/ia32.c
They conflict with /usr/include/i386-linux-gnu/sys/ucontext.h of newer eglibc
Author: Magnus Holmgren
Bug-Debian: http://bugs.debian.org/708366
Forwarded: yes
 
--- a/src/code/ia32.c
+++ b/src/code/ia32.c
@@ -14,14 +14,9 @@
#include "object.h"
#include "builtin_functions.h"
-/* This is defined on windows */
-#ifdef REG_NONE
-#undef REG_NONE
-#endif
-
-enum ia32_reg {REG_EAX = 0, REG_EBX = 3, REG_ECX = 1, REG_EDX = 2, REG_NONE = 4};
+enum ia32_reg {PIKE_REG_EAX = 0, PIKE_REG_EBX = 3, PIKE_REG_ECX = 1, PIKE_REG_EDX = 2, PIKE_REG_NONE = 4};
-#define REG_BITMASK ((1 << REG_NONE) - 1)
+#define REG_BITMASK ((1 << PIKE_REG_NONE) - 1)
/* #define REGISTER_DEBUG */
@@ -71,7 +66,7 @@ static int alloc_regs = 0, valid_regs =
#define MOV_ABSADDR_TO_REG(ADDR, REG) do { \
MAKE_VALID_REG (REG); \
/* movl addr,%reg */ \
- if ((REG) == REG_EAX) \
+ if ((REG) == PIKE_REG_EAX) \
add_to_program (0xa1); /* Move dword at address to EAX. */ \
else { \
add_to_program (0x8b); /* Move r/m32 to r32. */ \
@@ -83,7 +78,7 @@ static int alloc_regs = 0, valid_regs =
#define MOV_REG_TO_ABSADDR(REG, ADDR) do { \
CHECK_VALID_REG (REG); \
/* movl %reg,addr */ \
- if ((REG) == REG_EAX) \
+ if ((REG) == PIKE_REG_EAX) \
add_to_program (0xa3); /* Move EAX to dword at address. */ \
else { \
add_to_program (0x89); /* Move r32 to r/m32. */ \
@@ -217,7 +212,7 @@ static int alloc_regs = 0, valid_regs =
add_to_program (0x48 | (REG)); /* Decrement r32. */ \
else if (val_ < -128 || val_ > 127) { \
/* addl $val,%reg */ \
- if ((REG) == REG_EAX) \
+ if ((REG) == PIKE_REG_EAX) \
add_to_program (0x05); /* Add imm32 to EAX. */ \
else { \
add_to_program (0x81); /* Add imm32 to r/m32. */ \
@@ -334,8 +329,8 @@ ptrdiff_t ia32_prev_stored_pc; /* PROG_P
void ia32_flush_code_generator(void)
{
- next_reg = REG_EAX;
- sp_reg = fp_reg = mark_sp_reg = REG_NONE;
+ next_reg = PIKE_REG_EAX;
+ sp_reg = fp_reg = mark_sp_reg = PIKE_REG_NONE;
CLEAR_REGS();
ia32_prev_stored_pc = -1;
}
@@ -351,7 +346,7 @@ static enum ia32_reg alloc_reg (int avoi
/* There's a free register. */
for (reg = next_reg; (1 << reg) & used_regs;) {
- reg = (reg + 1) % REG_NONE;
+ reg = (reg + 1) % PIKE_REG_NONE;
#ifdef PIKE_DEBUG
if (reg == next_reg) Pike_fatal ("Failed to find a free register.\n");
#endif
@@ -364,15 +359,15 @@ static enum ia32_reg alloc_reg (int avoi
* probably be replaced with an LRU strategy. */
for (reg = next_reg; (1 << reg) & avoid_regs;) {
- reg = (reg + 1) % REG_NONE;
+ reg = (reg + 1) % PIKE_REG_NONE;
#ifdef PIKE_DEBUG
if (reg == next_reg) Pike_fatal ("Failed to find a non-excluded register.\n");
#endif
}
- if (sp_reg == reg) {sp_reg = REG_NONE; DEALLOC_REG (reg);}
- else if (fp_reg == reg) {fp_reg = REG_NONE; DEALLOC_REG (reg);}
- else if (mark_sp_reg == reg) {mark_sp_reg = REG_NONE; DEALLOC_REG (reg);}
+ if (sp_reg == reg) {sp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);}
+ else if (fp_reg == reg) {fp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);}
+ else if (mark_sp_reg == reg) {mark_sp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);}
}
#ifdef REGISTER_DEBUG
@@ -386,11 +381,11 @@ static enum ia32_reg alloc_reg (int avoi
#define DEF_LOAD_REG(REG, SET) \
static void PIKE_CONCAT(load_,REG) (int avoid_regs) \
{ \
- if (REG == REG_NONE) { \
+ if (REG == PIKE_REG_NONE) { \
REG = alloc_reg (avoid_regs); \
/* Update the round robin pointer here so that we disregard */ \
/* the direct calls to alloc_reg for temporary registers. */ \
- next_reg = (REG + 1) % REG_NONE; \
+ next_reg = (REG + 1) % PIKE_REG_NONE; \
{SET;} \
} \
else \
@@ -410,8 +405,8 @@ DEF_LOAD_REG (mark_sp_reg, {
static void ia32_call_c_function(void *addr)
{
CALL_RELATIVE(addr);
- next_reg = REG_EAX;
- sp_reg = fp_reg = mark_sp_reg = REG_NONE;
+ next_reg = PIKE_REG_EAX;
+ sp_reg = fp_reg = mark_sp_reg = PIKE_REG_NONE;
CLEAR_REGS();
}
/trunk/debian/patches/nettle-2.1.patch
0,0 → 1,122
--- a/src/post_modules/Nettle/cipher.cmod
+++ b/src/post_modules/Nettle/cipher.cmod
@@ -572,23 +572,11 @@ pike_des_set_key(void *c,
if (!des_set_key(ctx, (const uint8_t *)key))
{
- switch (ctx->status)
- {
- case DES_WEAK_KEY:
if (force)
/* Use key anyway */
- ctx->status = DES_OK;
+ ;
else
Pike_error("DES_INFO: Key is weak.\n");
- break;
-
- case DES_BAD_PARITY:
- /* FIXME: I don't think this should be visible in the user
- * interface, the parity bits should just be ignored. */
- Pike_error("DES_INFO: Key has bad parity.\n");
- default:
- Pike_error("DES_INFO: Unexpected error, please send a bug report.\n");
- }
}
}
@@ -742,28 +730,15 @@ pike_des3_set_key(void *c,
break;
}
- /* The hack of resetting ctx->status to use a weak key doesn't
- * currently work with nettle's des3_set_key function. So we set the
- * individual keys by ourself. */
- for (i = 0; i<3; i++, key += DES_KEY_SIZE)
- if (!des_set_key(&ctx->des[i], (const uint8_t *)key))
- switch (ctx->des[i].status)
- {
- case DES_WEAK_KEY:
+ /* Since Nettle 2.1 has removed the status field and simply returns
+ zero if the key is weak, we can simply call des3_set_key */
+ if (!des3_set_key(ctx, (const uint8_t *)key)) {
if (force)
/* Use key anyway */
- ctx->des[i].status = DES_OK;
+ ;
else
Pike_error("DES3_INFO: Key is weak.\n");
- break;
-
- case DES_BAD_PARITY:
- /* FIXME: I don't think this should be visible in the user
- * interface, the parity bits should just be ignored. */
- Pike_error("DES3_INFO: Key has bad parity.\n");
- default:
- Pike_error("DES3_INFO: Unexpected error, please send a bug report.\n");
- }
+ }
}
#define pike_des3_set_encrypt_key pike_des3_set_key
#define pike_des3_set_decrypt_key pike_des3_set_key
--- a/src/post_modules/Nettle/cipher.c
+++ b/src/post_modules/Nettle/cipher.c
@@ -1093,23 +1093,11 @@ pike_des_set_key(void *c,
if (!des_set_key(ctx, (const uint8_t *)key))
{
- switch (ctx->status)
- {
- case DES_WEAK_KEY:
if (force)
/* Use key anyway */
- ctx->status = DES_OK;
+ ;
else
Pike_error("DES_INFO: Key is weak.\n");
- break;
-
- case DES_BAD_PARITY:
- /* FIXME: I don't think this should be visible in the user
- * interface, the parity bits should just be ignored. */
- Pike_error("DES_INFO: Key has bad parity.\n");
- default:
- Pike_error("DES_INFO: Unexpected error, please send a bug report.\n");
- }
}
}
@@ -1355,28 +1343,15 @@ pike_des3_set_key(void *c,
break;
}
- /* The hack of resetting ctx->status to use a weak key doesn't
- * currently work with nettle's des3_set_key function. So we set the
- * individual keys by ourself. */
- for (i = 0; i<3; i++, key += DES_KEY_SIZE)
- if (!des_set_key(&ctx->des[i], (const uint8_t *)key))
- switch (ctx->des[i].status)
- {
- case DES_WEAK_KEY:
+ /* Since Nettle 2.1 has removed the status field and simply returns
+ zero if the key is weak, we can simply call des3_set_key */
+ if (!des3_set_key(ctx, (const uint8_t *)key)) {
if (force)
/* Use key anyway */
- ctx->des[i].status = DES_OK;
+ ;
else
Pike_error("DES3_INFO: Key is weak.\n");
- break;
-
- case DES_BAD_PARITY:
- /* FIXME: I don't think this should be visible in the user
- * interface, the parity bits should just be ignored. */
- Pike_error("DES3_INFO: Key has bad parity.\n");
- default:
- Pike_error("DES3_INFO: Unexpected error, please send a bug report.\n");
- }
+ }
}
#define pike_des3_set_encrypt_key pike_des3_set_key
#define pike_des3_set_decrypt_key pike_des3_set_key
/trunk/.
Property changes:
Modified: svn:mergeinfo
## -0,1 +0,0 ##
Reverse-merged /branches/7.8-stable:r193-199