tags 469012 + patch
tags 469012 + pending
thank you
Hi,
Here is an NMU to fix this as well as the LSB init script and -doc
suggest bugs.
I believe it will be uploaded by the weekend if you don't get to it
first.
Thank you,
Barry deFreese
diff -Nru zorp-3.0.8/config.guess zorp-3.0.8/config.guess
--- zorp-3.0.8/config.guess 2007-03-19 02:27:51.000000000 -0400
+++ zorp-3.0.8/config.guess 2008-03-03 13:27:16.000000000 -0500
@@ -1,10 +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, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2006-07-02'
+timestamp='2008-01-23'
# 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
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,6 +161,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -329,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -531,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -780,7 +781,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,18 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -829,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -950,6 +964,9 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1225,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
@@ -1458,9 +1484,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/config.sub /tmp/uqXDu1EVEz/zorp-3.0.8/config.sub
--- zorp-3.0.8/config.sub 2007-03-19 02:27:51.000000000 -0400
+++ zorp-3.0.8/config.sub 2008-03-03 13:27:16.000000000 -0500
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2006-09-20'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -475,8 +487,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -683,6 +703,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -925,6 +957,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1014,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1219,7 +1258,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1453,9 @@
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/debian/changelog /tmp/uqXDu1EVEz/zorp-3.0.8/debian/changelog
--- zorp-3.0.8/debian/changelog 2007-03-19 02:27:49.000000000 -0400
+++ zorp-3.0.8/debian/changelog 2008-03-03 12:32:54.000000000 -0500
@@ -1,3 +1,13 @@
+zorp (3.0.8-0.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Use PyObject_Del instead of PyMem_DEL. (Closes: #469012).
+ * zorp suggests zorp-doc. (Closes: #392141).
+ * LSB formatted init script. (Closes: #469115).
+ + Thanks to Petter Reinholdtsen.
+
+ -- Barry deFreese <[EMAIL PROTECTED]> Mon, 03 Mar 2008 10:44:13 -0500
+
zorp (3.0.8-0.3) unstable; urgency=high
* Non-maintainer upload.
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/debian/control /tmp/uqXDu1EVEz/zorp-3.0.8/debian/control
--- zorp-3.0.8/debian/control 2006-10-10 10:10:19.000000000 -0400
+++ zorp-3.0.8/debian/control 2008-03-03 12:31:27.000000000 -0500
@@ -10,6 +10,7 @@
Section: net
Architecture: any
Depends: ${shlibs:Depends}, zorp-modules (= ${binary:Version}), python-extclass (>= 1.2-1), adduser
+Suggests: zorp-doc
Description: An advanced protocol analyzing firewall
Zorp is a new generation firewall. It is essentially a transparent proxy
firewall, with strict protocol analyzing proxies, a modular architecture,
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/debian/zorp.init /tmp/uqXDu1EVEz/zorp-3.0.8/debian/zorp.init
--- zorp-3.0.8/debian/zorp.init 2005-07-21 04:58:44.000000000 -0400
+++ zorp-3.0.8/debian/zorp.init 2008-03-03 12:33:42.000000000 -0500
@@ -1,4 +1,11 @@
#! /bin/sh
+### BEGIN INIT INFO
+# Provides: zorp
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
#
# skeleton example file to build /etc/init.d/ scripts.
# This file should be used to construct scripts for /etc/init.d.
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/lib/proxyvars.c /tmp/uqXDu1EVEz/zorp-3.0.8/lib/proxyvars.c
--- zorp-3.0.8/lib/proxyvars.c 2005-11-03 04:14:13.000000000 -0500
+++ zorp-3.0.8/lib/proxyvars.c 2008-03-03 10:41:11.000000000 -0500
@@ -500,7 +500,7 @@
static void
z_py_zorp_method_free(ZorpMethod *self)
{
- PyMem_DEL(self);
+ PyObject_Del(self);
}
PyTypeObject z_py_zorp_method_type =
@@ -625,7 +625,7 @@
{
g_hash_table_foreach_remove(self->hash, z_py_zorp_hash_unref_items, NULL);
g_hash_table_destroy(self->hash);
- PyMem_DEL(self);
+ PyObject_Del(self);
}
/**
@@ -830,7 +830,7 @@
z_py_zorp_dimhash_free(ZorpDimHash *self)
{
z_dim_hash_table_free(self->hash, z_py_zorp_dimhash_unref_items);
- PyMem_DEL(self);
+ PyObject_Del(self);
}
/**
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/lib/pyattach.c /tmp/uqXDu1EVEz/zorp-3.0.8/lib/pyattach.c
--- zorp-3.0.8/lib/pyattach.c 2005-11-03 04:14:13.000000000 -0500
+++ zorp-3.0.8/lib/pyattach.c 2008-03-03 10:41:53.000000000 -0500
@@ -302,7 +302,7 @@
}
z_sockaddr_unref(self->local);
- PyMem_DEL(self);
+ PyObject_Del(self);
z_leave();
}
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/lib/pydispatch.c /tmp/uqXDu1EVEz/zorp-3.0.8/lib/pydispatch.c
--- zorp-3.0.8/lib/pydispatch.c 2005-11-03 04:14:13.000000000 -0500
+++ zorp-3.0.8/lib/pydispatch.c 2008-03-03 10:41:32.000000000 -0500
@@ -365,7 +365,7 @@
Py_END_ALLOW_THREADS;
self->policy_thread = NULL;
}
- PyMem_DEL(self);
+ PyObject_Del(self);
}
/**
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/lib/pyproxy.c /tmp/uqXDu1EVEz/zorp-3.0.8/lib/pyproxy.c
--- zorp-3.0.8/lib/pyproxy.c 2005-11-03 04:14:13.000000000 -0500
+++ zorp-3.0.8/lib/pyproxy.c 2008-03-03 10:42:48.000000000 -0500
@@ -173,7 +173,7 @@
{
if (self->proxy)
z_proxy_unref(self->proxy);
- PyMem_DEL(self);
+ PyObject_Del(self);
}
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/lib/pysockaddr.c /tmp/uqXDu1EVEz/zorp-3.0.8/lib/pysockaddr.c
--- zorp-3.0.8/lib/pysockaddr.c 2005-11-03 04:14:13.000000000 -0500
+++ zorp-3.0.8/lib/pysockaddr.c 2008-03-03 10:43:09.000000000 -0500
@@ -460,7 +460,7 @@
z_py_zorp_sockaddr_free(ZorpSockAddr *self)
{
z_sockaddr_unref(self->sa);
- PyMem_DEL(self);
+ PyObject_Del(self);
}
diff -Nru /tmp/lXf4YQ1m8X/zorp-3.0.8/lib/pystream.c /tmp/uqXDu1EVEz/zorp-3.0.8/lib/pystream.c
--- zorp-3.0.8/lib/pystream.c 2005-11-03 04:14:13.000000000 -0500
+++ zorp-3.0.8/lib/pystream.c 2008-03-03 10:40:12.000000000 -0500
@@ -163,7 +163,7 @@
ZorpStream *self = (ZorpStream *) o;
z_stream_unref(self->stream);
- PyMem_DEL(self);
+ PyObject_Del(self);
}
/**
