debian/0000755000000000000000000000000011735576326007205 5ustar debian/changelog0000644000000000000000000003543211735576326011066 0ustar zorp (3.9.5-4) unstable; urgency=low * [2042258] Added TODO file * [97c4b74] Added python-radix dependency (Closes: #666196) -- SZALAY Attila Sat, 31 Mar 2012 14:47:03 +0200 zorp (3.9.5-3) unstable; urgency=low * [811fb06] Fixed a typo what installed the same file into two package. Hopefully no other install problem will appear because I created a test system where I test the package install and upgrade from test and stable systems. (Closes: #665336) * [ffbc012] Added replace lines to ease the upgrade from stable system. -- SZALAY Attila Mon, 26 Mar 2012 01:21:49 +0200 zorp (3.9.5-2) unstable; urgency=low * With upstream approve library versioning scheme changed. Closes: #663686, #663549 * Changed package name to follow library version change. -- SZALAY Attila Tue, 20 Mar 2012 20:14:45 +0100 zorp (3.9.5-1) unstable; urgency=low * New upstream version * Re-generated quilt patches after rebasing to the new upstream. * Use the newly implemented --disable-werror option * Added changelog entry for the new release. * Removed bogus compile_problems patch. * Removed bogus and unimportant upstream Makefiles * Adjusted debian packaging to the upstream changes. * Library version changed from 3.9-0 to 3.9-5 -- SZALAY Attila Sun, 11 Mar 2012 17:51:40 +0100 zorp (3.9.3-2) unstable; urgency=low * Added Breaks clause to instrument dpkg to upgrade libzorp3.9-0 first (Closes: #659187) -- SZALAY Attila Sat, 25 Feb 2012 14:39:50 +0100 zorp (3.9.3-1) unstable; urgency=low * New upstream version * Added anypy directory to make configure happy * Changed zorp program install dir name to pkglibexec * Fixed some more compilation problem. * Fixed packaging after upstream removed all debian-related files. * Remove .la files from zorp-modules package. * Reverted zorp-modules.conffiles addition. * Moved from dh_movefiles to dh_install * Added fail-missing option to dh_install * Added exclude list for dh_install * Removed zorp-config from libzorp3.9-0. -- SZALAY Attila Mon, 06 Feb 2012 23:46:33 +0100 zorp (3.9.2-4) unstable; urgency=medium * Declared conflict between the old zorp-modules and the new zorp package because the Pssl.py moved to the former. Closes: #657054 -- SZALAY Attila Wed, 25 Jan 2012 07:16:23 +0100 zorp (3.9.2-3) unstable; urgency=low * Fixed some compilation problem caused by python2.7. Closes: #644494 -- SZALAY Attila Thu, 06 Oct 2011 22:45:36 +0200 zorp (3.9.2-2) unstable; urgency=low * Upgraded to policy version 3.9.2 * Remove /var/lib/zorp directory at purge. * Added build-arch and build-indep target to the debian/rules. -- SZALAY Attila Thu, 15 Sep 2011 14:42:47 +0200 zorp (3.9.2-1) unstable; urgency=low * New upstream version * Fixed compilation problems. * Removed .la files. Closes: #633221 * Fixed a typo in libzorp3.9-0 package description. Closes: #631010 -- SZALAY Attila Tue, 30 Aug 2011 21:22:14 +0200 zorp (3.9.0-4) unstable; urgency=low * Fixed compilation problems with openssl version 1.0 Closes: #621884 * Fixed libzorp package description. Closes: #590870, #596109 -- SZALAY Attila Tue, 10 May 2011 21:33:40 +0200 zorp (3.9.0-3) experimental; urgency=low * Strict the compilation into Linux systems because of some kernel dependency (for example tproxy) -- SZALAY Attila Thu, 05 May 2011 21:01:09 +0200 zorp (3.9.0-2) experimental; urgency=low * Switch to dpkg-source 3.0 (quilt) format -- SZALAY Attila Fri, 11 Mar 2011 22:00:03 +0100 zorp (3.9.0-1) experimental; urgency=low * New upstream version -- SZALAY Attila Mon, 07 Mar 2011 23:06:35 +0100 zorp (3.3.6-1.1) unstable; urgency=low * Non-maintainer upload * Add to libzorp0: "Replaces: "libzorp2; Breaks: libzorp2" to fix error when upgrading from lenny (closes: #601991). Thanks to Marcos Marado for the hint. -- Ralf Treinen Thu, 11 Nov 2010 15:28:28 +0100 zorp (3.3.6-1) unstable; urgency=low * New upstream version. -- SZALAY Attila Tue, 29 Jun 2010 17:18:42 +0200 zorp (3.0.8-0.5) unstable; urgency=high * Non-maintainer upload. * Force using python2.4. Closes: #506700. -- Thomas Viehmann Sun, 23 Nov 2008 21:54:36 +0100 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 Mon, 03 Mar 2008 10:44:13 -0500 zorp (3.0.8-0.3) unstable; urgency=high * Non-maintainer upload. * High-urgency upload for RC bugfix. * debian/rules: Explicitly run aclocal-1.7 instead of aclocal (FTBFS with aclocal-1.9). * configure.in: Set datadir and libdir to ${prefix}/share and ${prefix}/lib. This is fixed upstream in version 3.0.14b with more intrusive changes in the build system. Note that ./configure --datadir and --libdir won't work. Closes: #413933 * Thanks to Nicolas Francois for the patch. * Also fix the clean target to use make distclean, not just make clean. * The previous change requires setting ZORP_PACKAGE_LICENSE=gpl when calling configure to avoid another FTBFS. -- Steve Langasek Sun, 18 Mar 2007 20:54:44 -0700 zorp (3.0.8-0.2) unstable; urgency=high * Non-maintainer upload to fix release critical bug. * Downgrade Depends of zorp-modules on zorp to a Recommends; remove cyclic dependency that broke purge (Closes: #389769). -- Thijs Kinkhorst Tue, 10 Oct 2006 15:58:17 +0200 zorp (3.0.8-0.1) unstable; urgency=low * Non-maintainer upload. * Update package to the last python policy (Closes: 380994). * Make the package binNMUable (use ${source:Version}). -- Pierre Habouzit Sun, 3 Sep 2006 23:40:28 +0200 zorp (3.0.8) unstable; urgency=low * New upstream version. -- SZALAY Attila Tue, 24 Jan 2006 19:35:29 +0000 zorp (3.0.5) unstable; urgency=low * New upstream version. -- SZALAY Attila Mon, 31 Oct 2005 16:07:32 +0000 zorp (2.0.9-10) unstable; urgency=high * Fixed FTBFS bug by Christian Hammers . Closes: #304666 -- SZALAY Attila Wed, 25 May 2005 19:42:51 +0200 zorp (2.0.9-9) unstable; urgency=low * Fixed invalid lvalue in test_registry. Closes: #290446 -- Magosányi Árpád (mag) Tue, 18 Jan 2005 10:17:54 +0000 zorp (2.0.9-8) unstable; urgency=low * tests are disabled for now. Closes: #280947 -- Magosányi Árpád (mag) Mon, 22 Nov 2004 21:53:00 +0100 zorp (2.0.9-6) unstable; urgency=low * makes tests runnable. Closes: #275978 -- Magosányi Árpád (mag) Sat, 30 Oct 2004 15:12:05 +0200 zorp (2.0.9-5) unstable; urgency=low * fixes python2.3 related crash. Closes: 262233 * we now have tests -- Magosányi Árpád (mag) Mon, 13 Sep 2004 16:47:24 +0200 zorp (2.0.9-4) unstable; urgency=low * fixed libzorpll build-dependency -- Magosányi Árpád (mag) Sun, 25 Jul 2004 06:22:01 +0000 zorp (2.0.9-3) unstable; urgency=low * made libzorpll dependencies more explicit. Closes: #255734 * fixed instances.conf manpage section * dropped g++ dependency, which has been brought in because an autoconf problem * added zorp-config manpage to libzorp2 -- Magosányi Árpád (mag) Fri, 9 Jul 2004 06:27:28 +0000 zorp (2.0.9-2) unstable; urgency=low * Build with newer libzorpll * Changelog and control are properly UTF-8 -- Magosányi Árpád (mag) Sun, 13 Jun 2004 23:17:34 +0200 zorp (2.0.9-1) unstable; urgency=low * Merged in upstream changes -- Magosányi Árpád (mag) Sat, 12 Jun 2004 01:04:49 +0200 zorp (2.0.8-3) unstable; urgency=low * Signedness bug. Closes: #177287 * Fixed the init script. Closes: #240355 * Fixed the uploader field in debian/control -- Magosányi Árpád (mag) Fri, 16 Apr 2004 14:51:33 +0000 zorp (2.0.8-2) unstable; urgency=low * New upstream version * 2.0.2-2 closed some bugs. Closes: #220911 * Build with the correct python version for python-extclass. (hopefully) Closes: #220916 -- Magosányi Árpád (mag) Fri, 12 Mar 2004 14:46:50 +0100 zorp (2.0.8-1) unstable; urgency=low * Unreleased -- Magosányi Árpád (mag) Wed, 10 Dec 2003 14:58:52 +0100 zorp (2.0.7-2) unstable; urgency=low * install instances.conf Closes: #220911 * sets ulimit to 65532. Works around #221257 -- Magosányi Árpád (mag) Tue, 2 Dec 2003 12:18:12 +0100 zorp (2.0.7-1) unstable; urgency=low * new upstream version * regenerate all generated files, brings in build dependency on autoconf * rearranged some includes to make gcc happy -- Magosányi Árpád (mag) Wed, 5 Nov 2003 01:35:44 +0100 zorp (2.0.6.3-1-2) unstable; urgency=low * added /var/lib/zorp to zorp * made shlib dependency computing simpler * added lintian and linda override for etc/zorp permission * some changes to the documentation * libzorp2-de is libdevel now * byte-compiling in postinst and removing .pyc, .pyo in prerm per python policy -- Magosányi Árpád (mag) Sun, 26 Oct 2003 22:30:28 +0100 zorp (2.0.6.3-1-1) unstable; urgency=low * add myself to maintainers * bumped up Standards-Version * added manpage for zorp-config * removed dot from end of short descriptions * fixed build dependency to debhelper * fixed (s)in copyright * cleaning config.{log,status,cache} in cleanup * other fixes to make lintian happier -- Magosányi Árpád (mag) Thu, 16 Oct 2003 00:21:00 +0200 zorp (2.0.6.3-1) zorp20gpl; urgency=low * New upstream version -- Balazs Scheidler Thu, 9 Oct 2003 10:27:24 +0200 zorp (2.0.6-1) zorp20gpl; urgency=low * New upstream version. * Fix Build dependency. (libzorpll version): Closes: #213117 -- Szalay Attila Mon, 29 Sep 2003 16:31:41 +0200 zorp (2.0.5.13-2) zorp20gpl; urgency=low * Don't install deleted files. -- Szalay Attila Thu, 18 Sep 2003 10:34:21 +0200 zorp (2.0.5.13-1) zorp20gpl; urgency=low * New upstream version. * Rearrange doc-base lines. Closes: #195208 -- Szalay Attila Thu, 18 Sep 2003 10:15:28 +0200 zorp (2.0.5.12-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Wed, 17 Sep 2003 15:09:29 +0200 zorp (2.0.5.10-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Thu, 21 Aug 2003 11:36:17 +0200 zorp (2.0.5.9-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Tue, 19 Aug 2003 15:22:52 +0200 zorp (2.0.5.8-1) zorp20gpl; urgency=low * New upstream version -- SZALAY Attila Sat, 16 Aug 2003 01:30:30 +0200 zorp (2.0.5.7-1) zorp20gpl; urgency=low * New upstream version. -- SZALAY Attila Sat, 16 Aug 2003 00:51:21 +0200 zorp (2.0.5.6-1) zorp20gpl; urgency=low * New upstream version. -- SZALAY Attila Fri, 15 Aug 2003 23:06:53 +0200 zorp (2.0.5.5-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Fri, 15 Aug 2003 17:08:16 +0200 zorp (2.0.5.1-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Fri, 1 Aug 2003 17:42:45 +0200 zorp (2.0.5-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Thu, 31 Jul 2003 19:26:55 +0200 zorp (2.0.4.16-2) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Tue, 29 Jul 2003 17:55:15 +0200 zorp (2.0.4.10-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Mon, 14 Jul 2003 16:04:29 +0200 zorp (2.0.4.2-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Mon, 23 Jun 2003 18:18:30 +0200 zorp (2.0.4-1) zorp20gpl; urgency=low * New upstream version. -- Szalay Attila Mon, 16 Jun 2003 14:56:11 +0200 zorp (2.0.3.10-1) zorp20gpl; urgency=low * New upstream version. -- SZALAY Attila Mon, 2 Jun 2003 15:08:53 +0200 zorp (2.0.3.9-1) zorp20gpl; urgency=low * New upstream version. -- SZALAY Attila Thu, 29 May 2003 16:02:52 +0200 zorp (2.0.3.4-1) zorp20gpl; urgency=low * New upstream version. * Recompile with openssl 0.9.7 Closes: #187790 * Remove dead include in Authentication (it's only in commercial version) Closes: #187550 -- SZALAY Attila Tue, 27 May 2003 23:08:21 +0200 zorp (2.0.2.12-1) unstable; urgency=low * New upstream version. -- Szalay Attila Sat, 26 Apr 2003 16:50:36 +0200 zorp (2.0.2-1) unstable; urgency=low * New upstream version. -- Szalay Attila Thu, 6 Mar 2003 21:30:51 +0100 zorp (2.0.0-1) unstable; urgency=low * New upstream version. -- Szalay Attila Tue, 28 Jan 2003 19:32:36 +0100 zorp (2.0rc3-1) unstable; urgency=low * New upstream version. -- Szalay Attila Mon, 27 Jan 2003 12:03:34 +0100 zorp (2.0rc2-1) unstable; urgency=low * New upstream version. -- Szalay Attila Tue, 21 Jan 2003 16:02:20 +0100 zorp (2.0pre28-2) unstable; urgency=low * Build-depend on libcap-dev. Closes: #171382 * Untar html documentation, and register it in doc-base. It's happend in 2.0pre28-1, but I forgot to write. Closes: #170265 * Fix doc-base template. Closes: #171026 -- SZALAY Attila Tue, 3 Dec 2002 06:06:08 +0100 zorp (2.0pre28-1) unstable; urgency=low * News upstream version. -- Szalay Attila Thu, 28 Nov 2002 16:34:07 +0100 zorp (2.0pre26-1) unstable; urgency=low * New upstream version. -- Szalay Attila Mon, 25 Nov 2002 19:10:32 +0100 zorp (2.0pre25-1) unstable; urgency=low * New upstream version. -- Szalay Attila Tue, 19 Nov 2002 16:48:55 +0100 zorp (2.0pre21-1) unstable; urgency=low * New upstream version. -- SZALAY Attila Sat, 2 Nov 2002 00:20:16 +0100 zorp (2.0pre1-1) unstable; urgency=low * New upstream version. -- SZALAY Attila Sun, 27 Oct 2002 09:23:58 +0100 zorp (1.5.2-1) unstable; urgency=low * Initial release -- Szalay Attila Sat, 17 Aug 2002 14:13:14 +0200 debian/compat0000644000000000000000000000000211734412634010371 0ustar 7 debian/control0000644000000000000000000001102311735563651010602 0ustar Source: zorp Section: net Priority: optional Maintainer: SZALAY Attila Standards-Version: 3.9.2 Build-Depends: python-dev, libssl-dev (>=0.9.8), libglib2.0-dev (>= 2.2.1), libzorpll-dev (>=3.9.0.1), python-dns, python-support (>= 0.4), gperf, debhelper (>= 7), automake, autoconf, libtool Package: zorp Section: net Architecture: linux-any Depends: ${shlibs:Depends}, python-openssl (>= 0.10-1), python-dns, python-kzorp (=${source:Version}), ${misc:Depends}, adduser, ${python:Depends}, python-radix Suggests: zorp-doc, zorp-modules (= ${binary:Version}) Replaces: zorp-modules (<< 3.9.0-1) Breaks: zorp-modules (<< 3.9.0-1) Description: 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, and fine-grained control over the mediated traffic. Configuration decisions are scriptable with the Python based configuration language. . Zorp has been successfully deployed in demanding environments like the protection of high traffic web sites, or the protection of large intranets. Since the protocol analysis is strict and many of the common exploits violate the application protocol they are injected into, a large percentage of the attacks do not cross a Zorp based firewall even if the given service is permitted. Package: zorp-dbg Architecture: linux-any Section: debug Priority: extra Depends: zorp (= ${binary:Version}), ${misc:Depends} Description: 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, and fine-grained control over the mediated traffic. Configuration decisions are scriptable with the Python based configuration language. . Debug symbols. Package: libzorp3.9 Section: libs Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: zorp-dev, libzorp0, libzorp2 Replaces: libzorp2, libzorp0 Description: Runtime library of Zorp Zorp is a new generation firewall. It is essentially a transparent proxy firewall, with strict protocol analyzing proxies, a modular architecture, and fine-grained control over the mediated traffic. Configuration decisions are scriptable with the Python based configuration language. . Shared libraries of the Zorp system. Package: libzorp-dev Section: libdevel Architecture: linux-any Depends: python-dev (>=2.6), libzorpll-dev, libzorp3.9 (= ${binary:Version}), ${misc:Depends} Conflicts: zorp-dev, libzorp0-dev Breaks: libzorp3.9-0 (<= 3.9.2-4) Replaces: libzorp0-dev, zorp-dev Description: Development files needed to compile Zorp modules Zorp is a new generation firewall. It is essentially a transparent proxy firewall, with strict protocol analyzing proxies, a modular architecture, and fine-grained control over the mediated traffic. Configuration decisions are scriptable with the Python based configuration language. . These are the files you need to compile a zorp module. Package: zorp-modules Section: net Architecture: linux-any Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Recommends: zorp (= ${binary:Version}) Description: Default proxy modules for Zorp Zorp is a new generation firewall. It is essentially a transparent proxy firewall, with strict protocol analyzing proxies, a modular architecture, and fine-grained control over the mediated traffic. Configuration decisions are scriptable with the Python based configuration language. . This package includes proxies for the protocols: FINGER, FTP, HTTP, SSL, TELNET, WHOIS, and two general modules ANYPY and PLUG. Package: zorp-modules-dbg Architecture: linux-any Section: debug Priority: extra Depends: zorp-modules (= ${binary:Version}), ${misc:Depends} Description: Default proxy modules for Zorp Zorp is a new generation firewall. It is essentially a transparent proxy firewall, with strict protocol analyzing proxies, a modular architecture, and fine-grained control over the mediated traffic. Configuration decisions are scriptable with the Python based configuration language. . This package includes debug symbol of proxies. Package: python-kzorp Architecture: all Section: python Depends: ${python:Depends}, ${misc:Depends} Description: Python bindings for kzorp. Zorp is a new generation firewall. It is essentially a transparent proxy firewall, with strict protocol analyzing proxies, a modular architecture, and fine-grained control over the mediated traffic. Configuration decisions . General python bindings for kzorp. debian/copyright0000644000000000000000000000205511734412634011130 0ustar You may download this program from http://www.balabit.hu/downloads/zorp/ Upstream Author: Balázs Scheidler, Attila Szalay and more... Copyright: 2000-2010 BalaBit IT Kft. This program is licensed under GNU/GPL with a special exception to link with OpenSSL. 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License with the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. The Debian packaging is (C) 2010, SZALAY Attila and is licensed under the GPL, see above. debian/instances.conf0000644000000000000000000000071111734412634012030 0ustar ############################################################################ # # This file lists the Zorp instances you want to run. # # The instance name and arguments _must_ be separated by spaces instead # of tabs! Otherwise zorpctl will stop working. # This is a commented out example only! You should configure your own rules. #instance arguments #zorp_http --verbose=5 --policy /etc/zorp/policy-http.py #zorp_plug --policy /etc/zorp/policy-plug.py debian/libzorp-dev.install0000644000000000000000000000023211734412634013015 0ustar usr/include/zorp usr/lib/libzorp.so usr/lib/libzorpproxy.so usr/lib/pkgconfig/libzorp.pc usr/lib/pkgconfig/libzorpproxy.pc usr/share/zorp/moduledist.conf debian/libzorp3.9.install0000644000000000000000000000005711734413034012473 0ustar usr/lib/libzorp-*.so usr/lib/libzorpproxy-*.so debian/patches/0000755000000000000000000000000011734412634010622 5ustar debian/patches/0001-Changed-library-version-method.patch0000644000000000000000000000165511734412634020164 0ustar From: SZALAY Attila Date: Mon, 19 Mar 2012 22:12:57 +0100 Subject: [PATCH] Changed library version method. --- lib/Makefile.am | 1 - libproxy/Makefile.am | 4 ++++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 401c4fc..40736d8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,7 +5,6 @@ LIBS = @LIBZORP_LIBS@ lib_LTLIBRARIES = libzorp.la libzorp_la_LDFLAGS = \ - -version-info $(LIBZORP_LT_CURRENT):0:$(LIBZORP_LT_AGE) \ -release $(LIBZORP_LT_RELEASE) \ -export-dynamic diff --git a/libproxy/Makefile.am b/libproxy/Makefile.am index a6af997..5ca68e8 100644 --- a/libproxy/Makefile.am +++ b/libproxy/Makefile.am @@ -10,6 +10,10 @@ else libzorpproxy_la_PRO_SOURCES = endif +libzorpproxy_la_LDFLAGS = \ + -release $(LIBZORP_LT_RELEASE) \ + -export-dynamic + libzorpproxy_la_SOURCES = \ dottransfer.c \ errorloader.c \ -- debian/patches/0002-Removed-unneeded-and-bogus-Makefiles.patch0000644000000000000000000000230111734412634021157 0ustar From: SZALAY Attila Date: Sun, 11 Mar 2012 16:05:41 +0100 Subject: [PATCH] Removed unneeded and bogus Makefiles. --- configure.in | 1 - tests/Makefile.am | 2 +- tests/kzorp/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 58fe2ed..cf5a259 100644 --- a/configure.in +++ b/configure.in @@ -568,7 +568,6 @@ tests/python/Makefile tests/python/runtest.sh tests/unit/Makefile tests/kzorp/Makefile -tests/tools/Makefile modules/pop3/Makefile modules/pop3/messages/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index eba62eb..51c7ac8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = python unit kzorp tools +SUBDIRS = python unit kzorp EXTRA_DIST = functional/README.txt @TESTCASES@ diff --git a/tests/kzorp/Makefile.am b/tests/kzorp/Makefile.am index d2e3b94..a8c30cc 100644 --- a/tests/kzorp/Makefile.am +++ b/tests/kzorp/Makefile.am @@ -2,7 +2,7 @@ pkglibdir=$(libdir)/zorp/tests check_PROGRAMS = get_kzorp_result -pkglib_PROGRAMS = get_kzorp_result +#pkglib_PROGRAMS = get_kzorp_result get_kzorp_result_SOURCES = get_kzorp_result.c -- debian/patches/0003-zorpconfig_man.diff.patch0000644000000000000000000000271111734412634016146 0ustar From: SZALAY Attila Date: Thu, 2 Feb 2012 22:18:55 +0100 Subject: [PATCH] zorpconfig_man.diff =================================================================== --- doc/man/zorp-config.1 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 doc/man/zorp-config.1 diff --git a/doc/man/zorp-config.1 b/doc/man/zorp-config.1 new file mode 100644 index 0000000..9b6ef36 --- /dev/null +++ b/doc/man/zorp-config.1 @@ -0,0 +1,60 @@ +.\" Copyright (c) 2003-2004 BalaBit IT Ltd. +.TH ZORP-CONFIG 5 "March 10, 2004" +.SH NAME +zorp-config \- Zorp compilation environment +.SH SYNOPSIS +zorp-config [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] +.SH DESCRIPTION + +Zorp is a new generation proxy firewall suite for Unix based operating +systems. + +\fIzorp-config\fP is a tool that is used to configure to determine +the compiler and linker flags that should be used to compile Zorp modules. + +.SH OPTIONS + +.TP +.B --prefix + +.TP +.B --exec-prefix + +.TP +.B --version + +.TP +.B --cppflags + +.TP +.B --cflags + +.TP +.B --libs + +.TP +.B --local-cppflags + +.TP +.B --local-cflags + +.TP +.B --local-libs + +.TP +.B --datadir + +.TP +.B --moduledir + +.TP +.B --trace + +.TP +.B --debug + +.SH SEE ALSO +.BR zorp (8) +.SH AUTHOR +This manual page was written by rpd Magosnyi and Balzs +Scheidler . -- debian/patches/0004-Removed-all-pre-related-ifs-from-Makefiles-and-confi.patch0000644000000000000000000001015511734412634024051 0ustar From: SZALAY Attila Date: Fri, 3 Feb 2012 01:22:31 +0100 Subject: [PATCH] Removed all pre-related ifs from Makefiles and configure.in --- configure.in | 47 +---------------------------------------------- libproxy/Makefile.am | 7 ------- zorp/Makefile.am | 4 ---- 3 files changed, 1 insertions(+), 57 deletions(-) diff --git a/configure.in b/configure.in index cf5a259..4d4101c 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ AC_INIT(zorp/main.c) dnl *************************************************************************** dnl Definitions -PACKAGE=zorp-pro +PACKAGE=zorp BROCHURE_VERSION="3.9" VERSION=`cat $srcdir/VERSION` ZORP_PRODUCT_NAME="Zorp Professional" @@ -24,8 +24,6 @@ dnl Dependencies GLIB_MIN_VERSION="2.2.1" ZORPLL_MIN_VERSION="3.9.1.0" -ZORPLIC_MIN_VERSION="3.9.1" -ZORPMISC_MIN_VERSION="3.9.1" OPENSSL_MIN_VERSION="0.9.8" PYTHON_MIN_VERSION="2.6" @@ -49,21 +47,6 @@ if test -r $srcdir/dist.conf; then source $srcdir/dist.conf fi -if test -z "$ZORP_PACKAGE_LICENSE"; then - ZORP_PACKAGE_LICENSE="pro" -fi - -if test "$ZORP_PACKAGE_LICENSE" = "gpl"; then - PACKAGE="zorp" - PACKAGE_SUFFIX="" -elif test "$ZORP_PACKAGE_LICENSE" = "pro"; then - PACKAGE_SUFFIX="-pro" -else - AC_ERROR(Invalid license type: %s) -fi - -AM_CONDITIONAL(PRO, test x$ZORP_PACKAGE_LICENSE = xpro) - AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) @@ -275,27 +258,6 @@ PKG_CHECK_MODULES(ZORPLL, zorplibll >= $ZORPLL_MIN_VERSION,, PKG_CHECK_MODULES(OPENSSL, openssl >= $OPENSSL_MIN_VERSION,, AC_MSG_ERROR(Cannot find OpenSSL library version >= $OPENSSL_MIN_VERSION: is pkg-config in path?)) -if test "$ZORP_PACKAGE_LICENSE" = "pro"; then - - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS" - AC_CHECK_HEADER(openssl/ts.h, [], [AC_MSG_ERROR([OpenSSL header file is missing])]) - CPPFLAGS=$save_CPPFLAGS - - PKG_CHECK_MODULES(ZORPLIC, libzlicense >= $ZORPLIC_MIN_VERSION,, - AC_MSG_ERROR(Cannot find ZORP license library version >= $ZORPLIC_MIN_VERSION: is pkg-config in path?)) - - PKG_CHECK_MODULES(ZORPMISC, libzmisc >= $ZORPMISC_MIN_VERSION,, - AC_MSG_ERROR(Cannot find Zorp Misc library version >= $ZORPMISC_MIN_VERSION: is pkg-config in path?)) - - AC_CHECK_LIB(pcap, pcap_open_live, PCAP_LIBS="$PCAP_LIBS -lpcap") - - AC_CHECK_HEADERS(google/coredumper.h) - AC_CHECK_LIB(coredumper, WriteCoreDump, COREDUMP_LIBS="$COREDUMP_LIBS -lcoredumper") - -fi - - dnl dnl Locating Python libraries dnl @@ -426,10 +388,6 @@ AC_SUBST(BROCHURE_VERSION) AC_SUBST(SNAPSHOT_VERSION) AC_SUBST(SOURCE_REVISION) -AC_SUBST(ZORP_PACKAGE_LICENSE) -AC_SUBST(PACKAGE_SUFFIX) - -AC_DEFINE_UNQUOTED(ZORP_LICENSE_VERSION, "$ZORP_LICENSE_VERSION", [Required license version]) AC_DEFINE_UNQUOTED(ZORP_PRODUCT_NAME, "$ZORP_PRODUCT_NAME", [Required product name in license]) AC_DEFINE_UNQUOTED(BROCHURE_VERSION, "$BROCHURE_VERSION", [Zorp brochure version]) @@ -517,7 +475,6 @@ coverage: $enable_coverage ipoptions: $enable_ip_options ipv6: $enable_ipv6 prefork: $enable_prefork -License: $ZORP_PACKAGE_LICENSE EOF @@ -532,8 +489,6 @@ AC_SUBST(LIBZORP_LT_AGE) AC_SUBST(GLIB_MIN_VERSION) AC_SUBST(ZORPLL_MIN_VERSION) -AC_SUBST(ZORPLIC_MIN_VERSION) -AC_SUBST(ZORPMISC_MIN_VERSION) AC_SUBST(OPENSSL_MIN_VERSION) AC_SUBST(PYTHON_MIN_VERSION) AC_SUBST(CURRDATE) diff --git a/libproxy/Makefile.am b/libproxy/Makefile.am index 5ca68e8..3e4295d 100644 --- a/libproxy/Makefile.am +++ b/libproxy/Makefile.am @@ -3,13 +3,6 @@ SUBDIRS = zorp LIBS = @DEPS_LIBS@ @ZORP_LIBS@ lib_LTLIBRARIES = libzorpproxy.la -if PRO -libzorpproxy_la_PRO_SOURCES = \ - polling_proxy.c -else -libzorpproxy_la_PRO_SOURCES = -endif - libzorpproxy_la_LDFLAGS = \ -release $(LIBZORP_LT_RELEASE) \ -export-dynamic diff --git a/zorp/Makefile.am b/zorp/Makefile.am index 9f445fd..9f99958 100644 --- a/zorp/Makefile.am +++ b/zorp/Makefile.am @@ -2,10 +2,6 @@ pkglibdir=$(libdir)/zorp pkglibexecdir=$(libdir)/zorp LIBS=@ZORP_LIBS@ -if PRO -SUBDIRS = urlfilter -endif - pkglibexec_PROGRAMS = zorp zorp_SOURCES = main.c -- debian/patches/series0000644000000000000000000000027111734412634012037 0ustar 0001-Changed-library-version-method.patch 0002-Removed-unneeded-and-bogus-Makefiles.patch 0003-zorpconfig_man.diff.patch 0004-Removed-all-pre-related-ifs-from-Makefiles-and-confi.patch debian/python-kzorp.install0000644000000000000000000000004311734412634013244 0ustar usr/lib/python*/dist-packages/kznf debian/rules0000755000000000000000000000607711734412634010265 0ustar #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This is the debhelper compatability version to use. DDEBUG=`if (echo $(DEB_BUILD_OPTIONS) | grep -q debug) then \ echo "--enable-debug;" \ else \ echo ""; \ fi` build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp build-stamp: dh_testdir [ ! -f configure ] && ./autogen.sh ./configure \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --localstatedir=/var/lib/zorp \ --sysconfdir=/etc \ --with-pidfiledir=/var/run/zorp/ \ --disable-dmalloc \ $(DDEBUG) \ --enable-tproxy=netfilter \ --disable-werror # Add here commands to compile the package. $(MAKE) touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp rm -f modules/config-stamp #-rm -rf debian/zorp-tests -rm config.log # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean dh_clean install: build dh_testdir dh_testroot dh_prep dh_installdirs # Add here commands to install the package into debian/tmp. $(MAKE) install DESTDIR=`pwd`/debian/tmp/ mv `pwd`/debian/tmp/etc/zorp/zorpctl.conf.sample `pwd`/debian/tmp/etc/zorp/zorpctl.conf find `pwd`/debian/tmp -name \*.la | xargs rm dh_install --fail-missing --exclude usr/sbin/kzorp --exclude usr/lib/python2.7/dist-packages/python_kzorp-0.0.0.egg-info \ #mkdir -p `pwd`/debian/zorp-tests/usr/share/zorp/testdb #cp -r tests/functional/* `pwd`/debian/zorp-tests/usr/share/zorp/testdb/ (cd pylib/kznf && python setup.py install --prefix ../../debian/python-kzorp/usr --install-layout=deb) # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. dh_testdir -i dh_testroot -i dh_installdocs -i dh_installchangelogs -i dh_link -i dh_lintian -i dh_compress -i dh_fixperms -i dh_pysupport -i /usr/share/zorp dh_installdeb -i dh_shlibdeps -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i # Build architecture-dependent files here. binary-arch: build install dh_testdir -a dh_testroot -a dh_installdocs -a rm debian/zorp/usr/share/doc/zorp/INSTALL dh_installinit --package=zorp --name=zorp dh_installcron --package=zorp --name=zorp dh_installlogrotate --package=zorp --name=zorp dh_installman --package=zorp doc/man/zorp.8 doc/man/zorpctl.8 doc/man/instances.conf.5 dh_installman --package=libzorp-dev doc/man/zorp-config.1 dh_installchangelogs -a dh_link -a dh_lintian -a dh_strip --package zorp --dbg-package zorp-dbg dh_strip --package zorp-modules --dbg-package zorp-modules-dbg dh_strip -a dh_compress -a dh_fixperms -a chmod 750 `pwd`/debian/zorp/etc/zorp dh_makeshlibs -n dh_makeshlibs -plibzorp3.9 -V dh_pysupport -a /usr/share/zorp dh_pysupport -p zorp-modules dh_installdeb -a dh_shlibdeps -a -Llibzorp3.9 -l`pwd`/debian/libzorp3.9/usr/lib dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install debian/source/0000755000000000000000000000000011734413034010466 5ustar debian/source/format0000644000000000000000000000001411734412634011701 0ustar 3.0 (quilt) debian/zorp-doc.doc-base.reference0000644000000000000000000000106211734412634014263 0ustar Document: zorp Title: Zorp Application Level firewall Reference Guide Author: Balazs Scheidler Abstract: Zorp is a new generation firewall. It is essentially a transparent proxy firewall, with strict protocol analyzing proxies, a modular architecture, and fine-grained control over the mediated traffic. Configuration decisions are scriptable with the Python based configuration language. Section: Network/Monitoring Format: HTML Index: /usr/share/doc/zorp-doc/html/zorp-reference/book1.html Files: /usr/share/doc/zorp-doc/html/zorp-reference/book1.html debian/zorp-doc.doc-base.tutorial0000644000000000000000000000103711734412634014172 0ustar Document: zorp Title: Zorp Application Level firewall tutorial Author: Balazs Scheidler Abstract: Zorp is a new generation firewall. It is essentially a transparent proxy firewall, with strict protocol analyzing proxies, a modular architecture, and fine-grained control over the mediated traffic. Configuration decisions are scriptable with the Python based configuration language. Section: Network/Monitoring Format: HTML Index: /usr/share/doc/zorp-doc/html/tutorial/book1.html Files: /usr/share/doc/zorp-doc/html/tutorial/book1.html debian/zorp-doc.install0000644000000000000000000000000111734412634012307 0ustar debian/zorp-modules.install0000644000000000000000000000111111734412634013215 0ustar usr/lib/zorp/libanypy.so* usr/share/zorp/pylib/Zorp/AnyPy.py usr/lib/zorp/libfinger.so* usr/share/zorp/pylib/Zorp/Finger.py usr/lib/zorp/libftp.so* usr/share/zorp/pylib/Zorp/Ftp.py usr/lib/zorp/libhttp.so* usr/share/zorp/pylib/Zorp/Http.py usr/share/zorp/http/* usr/lib/zorp/libplug.so* usr/share/zorp/pylib/Zorp/Plug.py usr/lib/zorp/libpop3.so* usr/share/zorp/pylib/Zorp/Pop3.py usr/share/zorp/pop3/* usr/lib/zorp/libsmtp.so* usr/share/zorp/pylib/Zorp/Smtp.py usr/lib/zorp/libtelnet.so* usr/share/zorp/pylib/Zorp/Telnet.py usr/lib/zorp/libwhois.so* usr/share/zorp/pylib/Zorp/Whois.py debian/zorp-modules.postrm0000644000000000000000000000040011734412634013073 0ustar #!/bin/sh -e #DEBHELPER# if [ "x$1" = "xpurge" ]; then rm -f /usr/share/zorp/pylib/Zorp/*pyc if [ -d /usr/share/zorp ]; then cd /usr/share/ rmdir --ignore-fail-on-non-empty zorp/pylib/Zorp rmdir --parents --ignore-fail-on-non-empty zorp/* fi fi debian/zorp.docs0000644000000000000000000000001711734412634011035 0ustar INSTALL README debian/zorp.init0000644000000000000000000000225511734412634011056 0ustar #! /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. # # Written by Miquel van Smoorenburg . # Modified for Debian GNU/Linux # by Ian Murdock . # # Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl # # This file was automatically customized by dh-make on Tue, 9 May 2000 07:17:22 +0200 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ZORPCTL=/usr/sbin/zorpctl test -x $ZORPCTL || exit 0 set -e case "$1" in start) shift $ZORPCTL start $@ || true ;; stop) shift $ZORPCTL stop $@ || true ;; reload-or-restart) shift $ZORPCTL reload-or-restart $@ || true ;; reload|force-reload) shift $ZORPCTL reload $@ || true ;; restart) shift $ZORPCTL restart $@ || true ;; *) N=/etc/init.d/$NAME echo "Usage: $N {start|stop|restart|reload|force-reload|reload-or-restart}" >&2 exit 1 ;; esac exit 0 debian/zorp.install0000644000000000000000000000240011734412634011551 0ustar etc/zorp/* usr/sbin/zorpctl usr/share/man/man5/* usr/share/man/man8/* usr/share/zorp/pylib/Zorp/Auth.py usr/share/zorp/pylib/Zorp/AuthDB.py usr/share/zorp/pylib/Zorp/Cache.py usr/share/zorp/pylib/Zorp/Chainer.py usr/share/zorp/pylib/Zorp/Config.py usr/share/zorp/pylib/Zorp/Core.py usr/share/zorp/pylib/Zorp/Dispatch.py usr/share/zorp/pylib/Zorp/Subnet.py usr/share/zorp/pylib/Zorp/Globals.py usr/share/zorp/pylib/Zorp/Keybridge.py usr/share/zorp/pylib/Zorp/Listener.py usr/share/zorp/pylib/Zorp/Matcher.py usr/share/zorp/pylib/Zorp/NAT.py usr/share/zorp/pylib/Zorp/Notification.py usr/share/zorp/pylib/Zorp/Proxy.py usr/share/zorp/pylib/Zorp/Pssl.py usr/share/zorp/pylib/Zorp/Receiver.py usr/share/zorp/pylib/Zorp/Router.py usr/share/zorp/pylib/Zorp/Resolver.py usr/share/zorp/pylib/Zorp/Service.py usr/share/zorp/pylib/Zorp/Session.py usr/share/zorp/pylib/Zorp/SockAddr.py usr/share/zorp/pylib/Zorp/Stack.py usr/share/zorp/pylib/Zorp/Stream.py usr/share/zorp/pylib/Zorp/Zone.py usr/share/zorp/pylib/Zorp/Zorp.py usr/share/zorp/pylib/Zorp/KZorp.py usr/share/zorp/pylib/Zorp/Util.py usr/share/zorp/pylib/Zorp/Rule.py usr/share/zorp/pylib/Zorp/Exceptions.py usr/share/zorp/pylib/Zorp/Encryption.py usr/share/zorp/pylib/Zorp/__init__.py usr/lib/zorp/zorp usr/share/zorp/policy.boot debian/zorp.postinst0000644000000000000000000000102011734412634011763 0ustar #!/bin/sh -e if [ "$1" = "configure" ]; then if ! getent group zorp >/dev/null 2>&1; then addgroup --quiet --system zorp fi if ! id zorp >/dev/null 2>&1; then adduser --quiet --system --no-create-home --ingroup zorp --home /var/lib/zorp zorp fi chown -R root:zorp /etc/zorp chmod 0750 /etc/zorp if [ ! -d /var/lib/zorp/keybridge-cache ]; then mkdir -p /var/lib/zorp/keybridge-cache fi chown -R zorp:zorp /var/lib/zorp/keybridge-cache chmod 0770 /var/lib/zorp/keybridge-cache fi #DEBHELPER# debian/zorp.postrm0000644000000000000000000000017011734412634011431 0ustar #!/bin/sh -e if [ "$1" = "purge" ]; then rm -rf /var/lib/zorp/keybridge-cache/ rmdir /var/lib/zorp fi #DEBHELPER# debian/TODO0000644000000000000000000000005211735562726007671 0ustar - Fixing init script to not hide problems