user [EMAIL PROTECTED]
usertag 378642 - intend-to-nmu
usertag 378642 + nmu-in-delayed-queue
stop
NMU is in delayed queue, diff used is below.
diff -u honeyd-1.5a/config.sub honeyd-1.5a/config.sub
--- honeyd-1.5a/config.sub
+++ honeyd-1.5a/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr |
avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore
\
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -274,11 +276,11 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle |
sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle |
sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
@@ -286,9 +288,6 @@
| z8k)
basic_machine=$basic_machine-unknown
;;
- m32c)
- basic_machine=$basic_machine-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -318,7 +317,7 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+ | avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
@@ -329,7 +328,7 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,11 +357,11 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* |
shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* |
sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-*
| sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
@@ -373,8 +372,6 @@
| ymp-* \
| z8k-*)
;;
- m32c-*)
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -1128,7 +1125,7 @@
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1217,7 +1214,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1369,6 +1366,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1378,9 +1378,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
diff -u honeyd-1.5a/debian/changelog honeyd-1.5a/debian/changelog
--- honeyd-1.5a/debian/changelog
+++ honeyd-1.5a/debian/changelog
@@ -1,3 +1,12 @@
+honeyd (1.5a-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix possible segfault in architectures where the size of a pointer is
+ greater than the size of an integer, such as ia64, by including string.h
+ in proxy_main.c (Closes: #378642)
+
+ -- dann frazier <[EMAIL PROTECTED]> Wed, 30 Aug 2006 18:50:02 -0600
+
honeyd (1.5a-2) unstable; urgency=low
* Added libpcre Build-Dep (Closes: 377612)
diff -u honeyd-1.5a/pypcap/Makefile honeyd-1.5a/pypcap/Makefile
--- honeyd-1.5a/pypcap/Makefile
+++ honeyd-1.5a/pypcap/Makefile
@@ -40,9 +40,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i486-pc-linux-gnu
-host_triplet = i486-pc-linux-gnu
-target_triplet = i486-pc-linux-gnu
+build_triplet = ia64-unknown-linux-gnu
+host_triplet = ia64-unknown-linux-gnu
+target_triplet = ia64-unknown-linux-gnu
subdir = pypcap
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -55,16 +55,16 @@
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/jfs/debian/security/honeyd/honeyd-1.5a/missing --run
aclocal-1.9
+ACLOCAL = ${SHELL} /space/debian/honeyd-1.5a/missing --run aclocal-1.9
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/jfs/debian/security/honeyd/honeyd-1.5a/missing --run tar
+AMTAR = ${SHELL} /space/debian/honeyd-1.5a/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/jfs/debian/security/honeyd/honeyd-1.5a/missing --run
autoconf
-AUTOHEADER = ${SHELL} /home/jfs/debian/security/honeyd/honeyd-1.5a/missing
--run autoheader
-AUTOMAKE = ${SHELL} /home/jfs/debian/security/honeyd/honeyd-1.5a/missing --run
automake-1.9
+AUTOCONF = ${SHELL} /space/debian/honeyd-1.5a/missing --run autoconf
+AUTOHEADER = ${SHELL} /space/debian/honeyd-1.5a/missing --run autoheader
+AUTOMAKE = ${SHELL} /space/debian/honeyd-1.5a/missing --run automake-1.9
AWK = gawk
-CC = i486-linux-gnu-gcc
+CC = ia64-linux-gnu-gcc
CCDEPMODE = depmode=none
CFLAGS =
COND_PYDPKT_FALSE =
@@ -73,10 +73,10 @@
COND_PYPCAP_TRUE = #
COND_REGRESS_FALSE =
COND_REGRESS_TRUE = #
-CPP = i486-linux-gnu-gcc -E
+CPP = ia64-linux-gnu-gcc -E
CPPFLAGS =
-CXX = i486-linux-gnu-g++
-CXXCPP = i486-linux-gnu-g++ -E
+CXX = ia64-linux-gnu-g++
+CXXCPP = ia64-linux-gnu-g++ -E
CXXDEPMODE = depmode=none
CXXFLAGS = -g -O2
CYGPATH_W = echo
@@ -92,13 +92,13 @@
ECHO_N = -n
ECHO_T =
EDITINC = -I/usr/include
-EDITLIB = -L/usr/lib -lreadline
+EDITLIB = -L/usr/lib -ledit
EGREP = /bin/grep -E
EVENTINC = -I/usr/include
EVENTLIB = -L/usr/lib -levent
EXEEXT =
-F77 =
-FFLAGS =
+F77 = ia64-linux-gnu-g77
+FFLAGS = -g -O2
GREP = /bin/grep
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
@@ -118,7 +118,7 @@
MAINT = #
MAINTAINER_MODE_FALSE =
MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /home/jfs/debian/security/honeyd/honeyd-1.5a/missing --run
makeinfo
+MAKEINFO = ${SHELL} /space/debian/honeyd-1.5a/missing --run makeinfo
OBJEXT = o
PACKAGE = honeyd
PACKAGE_BUGREPORT =
@@ -126,8 +126,8 @@
PACKAGE_STRING =
PACKAGE_TARNAME =
PACKAGE_VERSION =
-PATH_PYTHON = /usr/bin/python2.4
-PATH_PYTHON24 = /usr/bin/python2.4
+PATH_PYTHON = /usr/bin/python
+PATH_PYTHON24 =
PATH_RRDTOOL = /usr/bin/rrdtool
PATH_SEPARATOR = :
PCAPINC = -I/usr/include
@@ -162,26 +162,26 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i486-pc-linux-gnu
-build_alias = i486-linux-gnu
-build_cpu = i486
+build = ia64-unknown-linux-gnu
+build_alias = ia64-linux-gnu
+build_cpu = ia64
build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE}
dumbnetconfig = /usr/bin/dumbnet-config
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i486-pc-linux-gnu
-host_alias = i486-linux-gnu
-host_cpu = i486
+host = ia64-unknown-linux-gnu
+host_alias = ia64-linux-gnu
+host_cpu = ia64
host_os = linux-gnu
-host_vendor = pc
+host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${prefix}/share/info
-install_sh = /home/jfs/debian/security/honeyd/honeyd-1.5a/install-sh
+install_sh = /space/debian/honeyd-1.5a/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -196,11 +196,11 @@
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
sysconfdir = ${prefix}/etc
-target = i486-pc-linux-gnu
+target = ia64-unknown-linux-gnu
target_alias =
-target_cpu = i486
+target_cpu = ia64
target_os = linux-gnu
-target_vendor = pc
+target_vendor = unknown
all: all-am
.SUFFIXES:
diff -u honeyd-1.5a/config.guess honeyd-1.5a/config.guess
--- honeyd-1.5a/config.guess
+++ honeyd-1.5a/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -210,7 +211,7 @@
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@
case ${UNAME_MACHINE} in
pc98)
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed
-e 's/[-(].*//'` ;;
esac
@@ -780,9 +783,6 @@
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS_NT-*:*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -790,10 +790,10 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[345]*)
+ x86:Interix*:[3456]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T:Interix*:[345]*)
+ EM64T:Interix*:[3456]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit ;;
@@ -989,7 +992,7 @@
LIBC=gnulibc1
# endif
#else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C)
|| defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
only in patch2:
unchanged:
--- honeyd-1.5a.orig/subsystems/proxy_main.c
+++ honeyd-1.5a/subsystems/proxy_main.c
@@ -28,6 +28,7 @@
#include <fcntl.h>
#include <netdb.h>
#include <errno.h>
+#include <string.h>
#include <strings.h>
#include <stdlib.h>
#include <ctype.h>
--
dann frazier
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
