--- ebox-squid-1.5.orig/debian/watch +++ ebox-squid-1.5/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://ebox-platform.com/releases/sources/latest/ebox-squid-(\d[\d_.-]+)\.tar.gz --- ebox-squid-1.5.orig/debian/compat +++ ebox-squid-1.5/debian/compat @@ -0,0 +1 @@ +5 --- ebox-squid-1.5.orig/debian/copyright +++ ebox-squid-1.5/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Isaac Clerencia on +Fri, 20 Aug 2004 14:10:24 +0100. +It's currently maintained by Javier Uruen Val + +It was downloaded from http://www.ebox-platform.com/ + +Upstream Author: eBox Technologies S.L. + +Copyright (C) 2004-2005 Warp Networks S.L, DBS Servicios Informaticos S.L. +Copyright (C) 2006-2008 Warp Networks S.L. +Copyright (C) 2008-2009 eBox Technologies S.L.. + +License: + 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. + 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. + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL file. + +The Debian packaging is: + + (C) 2004, Isaac Clerencia + (C) 2008, Javier Uruen Val + +and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- ebox-squid-1.5.orig/debian/ebox-squid.postrm +++ ebox-squid-1.5/debian/ebox-squid.postrm @@ -0,0 +1,20 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +case "$1" in + remove) + # restart logs + invoke-rc.d ebox logs restart || true + + dpkg-trigger --no-await ebox + ;; + purge) + /usr/share/ebox/ebox-sql-table drop squid_access || true + /usr/share/ebox/ebox-sql-table drop squid_access_report || true + /usr/share/ebox/ebox-sql-table-with-time-period drop squid_traffic || true + ;; +esac + --- ebox-squid-1.5.orig/debian/ebox.dansguardian.upstart +++ ebox-squid-1.5/debian/ebox.dansguardian.upstart @@ -0,0 +1,5 @@ +pre-start script + invoke-rc.d dansguardian stop || true +end script +exec /usr/sbin/dansguardian -N +respawn --- ebox-squid-1.5.orig/debian/rules +++ ebox-squid-1.5/debian/rules @@ -0,0 +1,5 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include debian/cdbs/ebox.mk --- ebox-squid-1.5.orig/debian/ebox.squid.upstart +++ ebox-squid-1.5/debian/ebox.squid.upstart @@ -0,0 +1,5 @@ +pre-start script + invoke-rc.d squid stop || true +end script +exec /usr/sbin/squid -D -sYC -N +respawn --- ebox-squid-1.5.orig/debian/changelog +++ ebox-squid-1.5/debian/changelog @@ -0,0 +1,238 @@ +ebox-squid (1.5-0ubuntu1) lucid; urgency=low + + [Javier Uruen Val] + * New upstream release (LP: #521805) + * debian/control + - Bump eBox dependency + - Update description + - Bump Standards-Version to 3.8.4 + * debian/copyright: updated emails and dates. + * debian/ebox-squid.postinst + - Add new SQL tables + * debian/ebox-squid.postrm + - Drop new SQL tables when purging + + -- Javier Uruen Val Sun, 07 Feb 2010 18:51:11 +0100 + +ebox-squid (1.3.5-0ubuntu1) karmic; urgency=low + + [Javier Uruen Val] + * New upstream release [LP: 411547] + * cdbs/ebox.mk + - GConf schemas are not used anymore + - Remove SCHEMASPATH variable + - Remove schemadir variable + - Fix the script that copy upstart scripts + - Use new upstart directory and file naming convention + * debian/control + - Bump standards version + - Bump eBox depenency + - Remove dependency on dpatch + - Add dependency on ebox-firewall, clamav-daemon + * debian/ebox-squid.postinst + - Fix indentation + - Do not pkill gconfd as it's not necessary anymore + - Run ebox trigger + - Add set -e + - Add || true + * debian/ebox-squid.postrm + - Run ebox trigger + - Add set -e + * remove debian/ebox-squid.prerm + - Not needed anymore as we don't use gconf schemas + * debian/patches + - Drop dpatch system + + Drop 01_intrepid_dansguardian.dpatch (Already shipped by upstream) + * debian/rules + - Do not include debian/cdbs/gnome.mk + * debian/watch + - Change URL + + -- Javier Uruen Val Wed, 05 Aug 2009 12:29:43 +0200 + +ebox-squid (1.3.2-1) jaunty; urgency=low + + * New upstream release + + -- Isaac Clerencia Sun, 19 Jul 2009 16:40:38 +0200 + +ebox-squid (1.3.1-1) jaunty; urgency=low + + * New upstream release + + -- Isaac Clerencia Wed, 15 Jul 2009 12:02:50 +0100 + +ebox-squid (1.3.0-1) jaunty; urgency=low + + * New upstream release + + -- Isaac Clerencia Thu, 02 Jul 2009 15:27:12 +0100 + +ebox-squid (1.1.30) hardy; urgency=low + + * New upstream release + + -- José Antonio Calvo Mon, 15 Jun 2009 16:17:00 +0200 + +ebox-squid (1.1.20) hardy; urgency=low + + * New upstream release + + -- Javier Amor Garcia Fri, 05 Jun 2009 14:15:03 +0200 + +ebox-squid (0.12.100) hardy; urgency=low + + * New upstream release + + -- Javier Uruen Val Tue, 13 Jan 2009 12:06:10 +0100 + +ebox-squid (0.12-0ubuntu1) jaunty; urgency=low + + [ Javier Uruen Val ] + * New upstream release. Closes (LP: #318817) + * debian/watch: + - add watch file. + * debiain/patches/01_intrepid_dansguardian.dpatch + - Patch to use the new configuration used by dansguardian 2.9.9.4 + onwards + + -- Mathias Gug Mon, 26 Jan 2009 22:17:15 -0500 + +ebox-squid (0.11.99-0ubuntu3) hardy; urgency=low + + * debian/ebox.dansguardian.upstart + - Fixed launching of dansguardian. + * debian/patches/04_enable_squid_logs + - Enable squid lo. + + -- Chuck Short Wed, 12 Mar 2008 12:29:30 -0400 + +ebox-squid (0.11.99-0ubuntu2) hardy; urgency=low + + * debian/control, + debian/patches/01_fix_transparent_proxy.dpatch, + debian/patches/02_add_to_proxy_group.dpatch, + debian/patches/03_add_missing_used_files.dpatch + - Added patches from upstream. + + -- Chuck Short Tue, 11 Mar 2008 10:35:34 -0400 + +ebox-squid (0.11.99-0ubuntu1) hardy; urgency=low + + * New upstream version. + + -- Chuck Short Wed, 27 Feb 2008 13:48:02 -0500 + +ebox-squid (0.11.99-0ubuntu1~ppa1) hardy; urgency=low + + * New upstream release + + -- Javier Uruen Val Mon, 25 Feb 2008 15:24:53 +0100 + +ebox-squid (0.11.99) unstable; urgency=low + + * New upstream release + + -- Enrique José Hernández Blasco Tue, 8 Jan 2008 16:14:41 +0100 + +ebox-squid (0.11.1-0ubuntu1~ppa1) hardy; urgency=low + + * New upstream release + + -- Javier Uruen Val Sun, 13 Jan 2008 20:13:00 +0100 + +ebox-squid (0.11) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Wed, 28 Nov 2007 15:23:35 +0100 + +ebox-squid (0.10.99) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Thu, 01 Nov 2007 21:38:15 +0100 + +ebox-squid (0.10) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Wed, 10 Oct 2007 21:53:53 +0200 + +ebox-squid (0.9.100) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Tue, 04 Sep 2007 14:22:30 +0200 + +ebox-squid (0.9.99) unstable; urgency=low + + * New upstream release + + -- Javier Amor Garcia Tue, 24 Jul 2007 13:01:36 +0200 + +ebox-squid (0.9.3) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Sun, 24 Jun 2007 16:38:49 +0200 + +ebox-squid (0.9.2) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Tue, 12 Jun 2007 18:59:28 +0200 + +ebox-squid (0.9.1) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Tue, 15 May 2007 13:02:27 +0200 + +ebox-squid (0.9) unstable; urgency=low + + * New upstream release + + -- Javier Amor Garcia Mon, 26 Mar 2007 12:04:19 +0200 + +ebox-squid (0.7.99) unstable; urgency=low + + * New upstream release + + -- Enrique José Hernández Blasco Thu, 16 Nov 2006 12:39:56 +0100 + +ebox-squid (0.7.1) unstable; urgency=low + + * New upstream release + + -- Daniel Baeyens Sicilia Wed, 22 Mar 2006 16:08:04 +0100 + +ebox-squid (0.7.0.99-rc1+0.7.1-rc1) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Tue, 17 Jan 2006 11:45:28 +0100 + +ebox-squid (0.5.1) unstable; urgency=low + + * New upstream release + + -- Guillermo Ontañón Mon, 14 Mar 2005 14:33:32 +0100 + +ebox-squid (0.5) unstable; urgency=low + + * New upstream release + + -- Isaac Clerencia Thu, 3 Mar 2005 19:56:06 +0100 + +ebox-squid (0.4-2) unstable; urgency=low + + * Added dansguardian in Depends: + + -- Isaac Clerencia Sat, 4 Dec 2004 16:36:45 +0100 + +ebox-squid (0.4-1) unstable; urgency=low + + * New upstream release + + -- Isaac Clerencia Fri, 3 Dec 2004 06:01:48 +0100 --- ebox-squid-1.5.orig/debian/ebox-squid.postinst +++ ebox-squid-1.5/debian/ebox-squid.postinst @@ -0,0 +1,37 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +case "$1" in + configure) + # add ebox to proxy to read squid logs + adduser --quiet ebox proxy || true + + # create log table + /usr/share/ebox/ebox-sql-table add squid_access /usr/share/ebox/sqllog/squid_access.sql + /usr/share/ebox/ebox-sql-table add squid_access_report /usr/share/ebox/sqllog/squid_access_report.sql + /usr/share/ebox/ebox-sql-table-with-time-period add squid_traffic /usr/share/ebox/sqllog/squid_traffic.sql + # migrate data if needed + /usr/share/ebox/ebox-migrate /usr/share/ebox-squid/migration/ || true + + # directory for extra dg domain lists + DG_EXTRALISTS=/etc/dansguardian/extralists + test -d $DG_EXTRALISTS || mkdir -p -m 0755 $DG_EXTRALISTS + + # restart logs + invoke-rc.d ebox logs restart || true + # restart squid module + invoke-rc.d ebox squid restart || true + # restart firewall module + invoke-rc.d ebox firewall restart || true + + dpkg-trigger --no-await ebox + ;; + +esac + + + +exit 0 --- ebox-squid-1.5.orig/debian/control +++ ebox-squid-1.5/debian/control @@ -0,0 +1,22 @@ +Source: ebox-squid +Section: web +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Javier Uruen Val +Build-Depends: debhelper (>= 5.0.0), cdbs +Standards-Version: 3.8.4 + +Package: ebox-squid +Architecture: all +Depends: ebox (>= 1.5), ebox (<< 1.5.100), ebox-firewall, ebox-objects, ebox-usersandgroups, squid, dansguardian ( >= 2.9), adduser, clamav-daemon ( >= 0.94), ${misc:Depends} +Conflicts: ebox (<< 0.9.99) +Replaces: ebox (<< 0.9.99) +Description: eBox - HTTP Proxy (Cache and Content Filter) + eBox Platform is an open source small business server that can act as + a Gateway, a Unified Threat Manager, an Office Server, an Infrastructure + Manager, a Unified Communications Server or a combination of them. One + single, easy-to-use platform to manage all your network services. + . + This module adds a transparent proxy cache, a HTTP content filter, + object access policies, banned/allowed domains and custom MIME type + and file extension filter to your eBox installation. --- ebox-squid-1.5.orig/debian/cdbs/ebox.mk +++ ebox-squid-1.5/debian/cdbs/ebox.mk @@ -0,0 +1,22 @@ +DEB_CONFIGURE_SCRIPT_ENV += LOGPATH="/var/log/ebox" +DEB_CONFIGURE_SCRIPT_ENV += CONFPATH="/var/lib/ebox/conf" +DEB_CONFIGURE_SCRIPT_ENV += STUBSPATH="/usr/share/ebox/stubs" +DEB_CONFIGURE_SCRIPT_ENV += CGIPATH="/usr/share/ebox/cgi/" +DEB_CONFIGURE_SCRIPT_ENV += TEMPLATESPATH="/usr/share/ebox/templates" +DEB_CONFIGURE_SCRIPT_ENV += WWWPATH="/usr/share/ebox/www/" +DEB_CONFIGURE_SCRIPT_ENV += CSSPATH="/usr/share/ebox/www/css" +DEB_CONFIGURE_SCRIPT_ENV += IMAGESPATH="/usr/share/ebox/www/images" +DEB_CONFIGURE_SCRIPT_ENV += VARPATH="/var" +DEB_CONFIGURE_SCRIPT_ENV += ETCPATH="/etc/ebox" +DEB_CONFIGURE_SCRIPT_ENV += SQUIDCONF="/etc/squid/squid.conf" + +DEB_CONFIGURE_EXTRA_FLAGS := --disable-runtime-tests +DEB_MAKE_INVOKE = $(MAKE) $(DEB_MAKE_FLAGS) -C $(DEB_BUILDDIR) + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + for event in debian/*.upstart ; do \ + install -d -m 755 debian/$(cdbs_curpkg)/etc/init; \ + DESTFILE=$$(basename $$(echo $$event | sed 's/\.upstart/.conf/g')); \ + install -m 644 "$$event" debian/$(cdbs_curpkg)/etc/init/$$DESTFILE; \ + done; +