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

Package-Manager: portage-2.0.54

5 files changed, 48 insertions, 64 deletions

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
 }