Ubuntu
squid3 package

Merge lp:~clint-fewbar/ubuntu/maverick/squid3/lp589830 into lp:ubuntu/maverick/squid3

  1. Maverick (10.10)
  2. lp589830
  3. Merge into maverick
Proposed by Clint Byrum
Status: Merged
Merged at revision: 22
Proposed branch: lp:~clint-fewbar/ubuntu/maverick/squid3/lp589830
Merge into: lp:ubuntu/maverick/squid3
Diff against target: 72 lines (+16/-1)
5 files modified
debian/changelog (+6/-0)
debian/control (+3/-1)
debian/rules (+2/-0)
debian/squid3.install (+1/-0)
debian/squid3.ufw.profile (+4/-0)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/maverick/squid3/lp589830
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+30436@code.launchpad.net

Description of the change

ufw change for squid3.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-07 15:21:06 +0000
3+++ debian/changelog 2010-07-20 16:38:46 +0000
4@@ -1,3 +1,9 @@
5+squid3 (3.1.5-2ubuntu1) maverick; urgency=low
6+
7+ * Adding ufw profile (LP: #589830)
8+
9+ -- Clint Byrum <clint@ubuntu.com> Tue, 20 Jul 2010 08:23:27 -0700
10+
11 squid3 (3.1.5-2) unstable; urgency=low
12
13 * debian/control
14
15=== modified file 'debian/control'
16--- debian/control 2010-07-07 15:21:06 +0000
17+++ debian/control 2010-07-20 16:38:46 +0000
18@@ -1,7 +1,8 @@
19 Source: squid3
20 Section: web
21 Priority: optional
22-Maintainer: Luigi Gangitano <luigi@debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Luigi Gangitano <luigi@debian.org>
25 Homepage: http://www.squid-cache.org
26 Standards-Version: 3.9.0
27 Build-Depends: libldap2-dev, libpam0g-dev, libdb-dev, dpatch (>= 2.0.9), cdbs, libsasl2-dev, debhelper (>=5), libcppunit-dev, libkrb5-dev, comerr-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libexpat1-dev, libxml2-dev, autotools-dev, libltdl-dev
28@@ -10,6 +11,7 @@
29 Architecture: any
30 Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, adduser, logrotate (>= 3.5.4-1), squid3-common (= ${source:Version}), lsb-base
31 Suggests: squidclient, squid-cgi, resolvconf (>= 0.40), smbclient
32+ , ufw
33 Description: A full featured Web Proxy cache (HTTP proxy)
34 Squid is a high-performance proxy caching server for web clients, supporting
35 FTP, gopher, and HTTP data objects.
36
37=== modified file 'debian/rules'
38--- debian/rules 2010-05-04 11:15:49 +0000
39+++ debian/rules 2010-07-20 16:38:46 +0000
40@@ -69,9 +69,11 @@
41 install -m 755 -g root -d $(INSTALLDIR)/etc/logrotate.d
42 install -m 755 -g root -d $(INSTALLDIR)/etc/resolvconf
43 install -m 755 -g root -d $(INSTALLDIR)/etc/resolvconf/update-libc.d
44+ install -m 755 -g root -d $(INSTALLDIR)/etc/ufw/applications.d
45 install -m 755 -g root debian/squid3.rc $(INSTALLDIR)/etc/init.d/squid3
46 install -m 755 -g root debian/squid3.resolvconf $(INSTALLDIR)/etc/resolvconf/update-libc.d/squid3
47 install -m 644 -g root debian/squid3.logrotate $(INSTALLDIR)/etc/logrotate.d/squid3
48+ install -m 644 -g root debian/squid3.ufw.profile $(INSTALLDIR)/etc/ufw/applications.d/squid3
49 install -m 755 -g root -d debian/squid3/var/log
50 install -m 755 -g root -d debian/squid3/var/spool
51 install -m 755 -g root -d debian/squid3/var/run
52
53=== modified file 'debian/squid3.install'
54--- debian/squid3.install 2010-04-01 00:33:21 +0000
55+++ debian/squid3.install 2010-07-20 16:38:46 +0000
56@@ -1,6 +1,7 @@
57 etc/squid3/squid.conf
58 etc/squid3/msntauth.conf
59 etc/squid3/errorpage.css
60+etc/ufw
61 etc/logrotate.d
62 etc/resolvconf
63 etc/init.d/squid3
64
65=== added file 'debian/squid3.ufw.profile'
66--- debian/squid3.ufw.profile 1970-01-01 00:00:00 +0000
67+++ debian/squid3.ufw.profile 2010-07-20 16:38:46 +0000
68@@ -0,0 +1,4 @@
69+[Squid]
70+title=Squid proxy cache
71+description=Internet object cache (WWW proxy cache)
72+ports=3128/tcp

Subscribers

People subscribed via source and target branches

to all changes: