Version bump (#127755). This new version has support for SSL tunnels.

(Portage version: 2.0.54)

8 files changed, 82 insertions, 80 deletions

diff --git a/net-proxy/havp/ChangeLog b/net-proxy/havp/ChangeLog
index afe1e714539c..3e789406ea9a 100644
--- a/net-proxy/havp/ChangeLog
+++ b/net-proxy/havp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/havp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.2 2006/03/06 19:05:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.3 2006/03/29 21:43:19 mrness Exp $
+
+*havp-0.78 (29 Mar 2006)
+
+  29 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  -files/havp-0.76-gentoo.patch, +files/havp-0.78-gentoo.patch,
+  files/havp.initd, -havp-0.76.ebuild, +havp-0.78.ebuild:
+  Version bump (#127755). This new version has support for SSL tunnels.
 
 *havp-0.77 (06 Mar 2006)
 
diff --git a/net-proxy/havp/Manifest b/net-proxy/havp/Manifest
index 4da6c89402ff..2ec8f05a1af2 100644
--- a/net-proxy/havp/Manifest
+++ b/net-proxy/havp/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8e5979a00867083bef539006bbbb6723 ChangeLog 539
 MD5 5f0038e98c854750a47b461140103117 files/digest-havp-0.76 61
 MD5 a10c233cad7f2b08b3ff13e2da257120 files/digest-havp-0.77 61
+MD5 ea5ad10659ea39e44e15b16c6be4c541 files/digest-havp-0.78 60
 MD5 84d09e8602d90d8f9be9fffbd4dbf0d3 files/havp-0.76-gentoo.patch 1684
 MD5 cd66ecd53dbfd35a54b9b087896b44b3 files/havp-0.77-gentoo.patch 1684
-MD5 2a830a7c8f88a3fc5df6dc89e67bef72 files/havp.initd 1604
+MD5 f5745a5052fb698dc7078955d4735ac8 files/havp-0.78-gentoo.patch 1433
+MD5 48ac043ca62a4c30df42d90463e3ce96 files/havp.initd 1600
 MD5 d6ea90eaf342c7105a4db463b0d22b05 havp-0.76.ebuild 1064
 MD5 d989585ab486e6582c1bc13542b64c7f havp-0.77.ebuild 1064
+MD5 7ad494d48f1846bfbf4181f654a350f5 havp-0.78.ebuild 1195
 MD5 eeef2b4ba39eb40826f14b0bd0489563 metadata.xml 309
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDIgAjG8pv1lIUX4RAg0ZAKCW2NcGX+0zkxi7QfLE31DXgSTZewCfUeMm
-PAKzGfoLbh4ff7TQl+YrAl4=
-=1m8k
------END PGP SIGNATURE-----
diff --git a/net-proxy/havp/files/digest-havp-0.76 b/net-proxy/havp/files/digest-havp-0.76
deleted file mode 100644
index 073cfed79f92..000000000000
--- a/net-proxy/havp/files/digest-havp-0.76
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb463ab58d7005487ad1d83350fb0128 havp-0.76.tar.gz 101916
diff --git a/net-proxy/havp/files/digest-havp-0.78 b/net-proxy/havp/files/digest-havp-0.78
new file mode 100644
index 000000000000..55715dcb1ce6
--- /dev/null
+++ b/net-proxy/havp/files/digest-havp-0.78
@@ -0,0 +1 @@
+MD5 23518e18ba140ab7ba85cf354fbf364e havp-0.78.tar.gz 96142
diff --git a/net-proxy/havp/files/havp-0.76-gentoo.patch b/net-proxy/havp/files/havp-0.76-gentoo.patch
deleted file mode 100644
index b8540c7f049f..000000000000
--- a/net-proxy/havp/files/havp-0.76-gentoo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nur havp-0.76.orig/etc/havp/havp.config havp-0.76/etc/havp/havp.config
---- havp-0.76.orig/etc/havp/havp.config	2006-01-08 18:29:00.000000000 +0200
-+++ havp-0.76/etc/havp/havp.config	2006-01-15 20:55:18.320500500 +0200
-@@ -24,7 +24,7 @@
- #
- # Default:
- # USER	nobody
--# GROUP	nogroup
-+# GROUP	nobody
- 
- #
- # The process id (PID) of the main HAVP process is written to this file.
-@@ -159,7 +159,7 @@
- # en, de, it
- #
- # Default:
--# TEMPLATEPATH /usr/local/etc/havp/templates/en
-+# TEMPLATEPATH /etc/havp/templates/en
- 
- #
- # Allow Range Requests
-@@ -176,14 +176,14 @@
- # URL which won't be scanned
- #
- # Default:
--# WHITELIST /usr/local/etc/havp/whitelist
-+# WHITELIST /etc/havp/whitelist
- 
- #
- # Blacklist files
- # URL which are denied
- #
- # Default:
--# BLACKLIST /usr/local/etc/havp/blacklist
-+# BLACKLIST /etc/havp/blacklist
- 
- #
- # Max size of downloads which were scanned
-diff -Nur havp-0.76.orig/havp/default.h.in havp-0.76/havp/default.h.in
---- havp-0.76.orig/havp/default.h.in	2006-01-08 18:32:36.000000000 +0200
-+++ havp-0.76/havp/default.h.in	2006-01-15 20:54:57.835220250 +0200
-@@ -45,15 +45,15 @@
-   #endif
- #endif
- 
--#define WHITELISTFILE "/usr/local/etc/havp/whitelist"
--#define BLACKLISTFILE "/usr/local/etc/havp/blacklist"
--#define TEMPLATEDIR  "/usr/local/etc/havp/templates/en"
--#define CONFIGFILE "/usr/local/etc/havp/havp.config"
-+#define WHITELISTFILE "/etc/havp/whitelist"
-+#define BLACKLISTFILE "/etc/havp/blacklist"
-+#define TEMPLATEDIR  "/etc/havp/templates/en"
-+#define CONFIGFILE "/etc/havp/havp.config"
- 
- 
- //Change to User and Group
- #define USER "nobody"
--#define GROUP "nogroup"
-+#define GROUP "nobody"
- 
- //Fork min server
- #define SERVERNUMBER 4
diff --git a/net-proxy/havp/files/havp-0.78-gentoo.patch b/net-proxy/havp/files/havp-0.78-gentoo.patch
new file mode 100644
index 000000000000..f3afc14d04e5
--- /dev/null
+++ b/net-proxy/havp/files/havp-0.78-gentoo.patch
@@ -0,0 +1,46 @@
+diff -Nru havp-0.78.orig/etc/havp/havp.config havp-0.78/etc/havp/havp.config
+--- havp-0.78.orig/etc/havp/havp.config	2006-03-11 13:45:04.000000000 +0200
++++ havp-0.78/etc/havp/havp.config	2006-03-30 00:00:55.055969500 +0300
+@@ -182,7 +182,7 @@
+ # Path to template files.
+ #
+ # Default:
+-# TEMPLATEPATH /usr/local/etc/havp/templates/en
++# TEMPLATEPATH /etc/havp/templates/en
+ 
+ #
+ # Set to true if you want to prefer Whitelist.
+@@ -196,13 +196,13 @@
+ # Whitelist of URLs not to scan.
+ #
+ # Default:
+-# WHITELIST /usr/local/etc/havp/whitelist
++# WHITELIST /etc/havp/whitelist
+ 
+ #
+ # Blacklist of URLs that are denied access.
+ #
+ # Default:
+-# BLACKLIST /usr/local/etc/havp/blacklist
++# BLACKLIST /etc/havp/blacklist
+ 
+ #
+ # Is scanner error fatal?
+diff -Nru havp-0.78.orig/havp/default.h.in havp-0.78/havp/default.h.in
+--- havp-0.78.orig/havp/default.h.in	2006-03-11 14:23:07.000000000 +0200
++++ havp-0.78/havp/default.h.in	2006-03-29 23:58:47.283984250 +0300
+@@ -57,10 +57,10 @@
+   #endif
+ #endif
+ 
+-#define WHITELISTFILE "/usr/local/etc/havp/whitelist"
+-#define BLACKLISTFILE "/usr/local/etc/havp/blacklist"
+-#define TEMPLATEDIR  "/usr/local/etc/havp/templates/en"
+-#define CONFIGFILE "/usr/local/etc/havp/havp.config"
++#define WHITELISTFILE "/etc/havp/whitelist"
++#define BLACKLISTFILE "/etc/havp/blacklist"
++#define TEMPLATEDIR  "/etc/havp/templates/en"
++#define CONFIGFILE "/etc/havp/havp.config"
+ 
+ 
+ //Change to User and Group
diff --git a/net-proxy/havp/files/havp.initd b/net-proxy/havp/files/havp.initd
index c3b13f9cc804..f79edbb9f7c4 100644
--- a/net-proxy/havp/files/havp.initd
+++ b/net-proxy/havp/files/havp.initd
@@ -40,7 +40,7 @@ checkconfig() {
 		return 1
 	fi
 
-	chown -R "${HAVP_USER:-nobody}:${HAVP_GROUP:-nobody}" /var/run/havp /var/tmp/havp /var/log/havp && \
+	chown -R "${HAVP_USER:-havp}:${HAVP_GROUP:-havp}" /var/run/havp /var/tmp/havp /var/log/havp && \
 		chmod -R 0755 /var/run/havp &&
 		chmod -R 0750 /var/tmp/havp
 }
diff --git a/net-proxy/havp/havp-0.76.ebuild b/net-proxy/havp/havp-0.78.ebuild
index a18b795ebb23..deb99755e60a 100644
--- a/net-proxy/havp/havp-0.76.ebuild
+++ b/net-proxy/havp/havp-0.78.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.76.ebuild,v 1.1 2006/01/15 20:28:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.78.ebuild,v 1.1 2006/03/29 21:43:19 mrness Exp $
 
 inherit eutils
 
@@ -11,10 +11,15 @@ SRC_URI="http://www.server-side.de/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="ssl"
 
 DEPEND="app-antivirus/clamav"
 
+pkg_setup() {
+	enewgroup havp
+	enewuser havp -1 -1 /etc/havp havp
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -22,10 +27,15 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-scanner=libclamav || die "configure failed"
+	econf --with-scanner=libclamav \
+		$(use_enable ssl ssl-tunnel) || die "configure failed"
 	emake || die "make failed"
 }
 
+pkg_preinst() {
+	pkg_setup
+}
+
 src_install() {
 	exeinto /usr/sbin
 	doexe havp/havp
@@ -34,7 +44,7 @@ src_install() {
 	insinto /etc
 	doins -r etc/havp
 
-	diropts -m 0700 -o nobody -g nobody
+	diropts -m 0700 -o havp -g havp
 	keepdir /var/log/havp
 
 	diropts -m 0750
@@ -46,4 +56,12 @@ src_install() {
 pkg_postinst() {
 	ewarn "/var/tmp/havp must be on a filesystem with mandatory locks!"
 	ewarn "You should add  \"mand\" to the mount options on the relevant line in /etc/fstab."
+
+	if use ssl; then
+		echo
+		ewarn "Note: ssl USE flag only enable SSL pass-through, which means that"
+		ewarn "      HTTPS pages will not be scanned for viruses!"
+		ewarn "      It is impossible to decrypt data sent through SSL connections without knowing"
+		ewarn "      the private key of the used certificate."
+	fi
 }