1 files changed, 0 insertions, 229 deletions
diff --git a/recipes-security/clamav/clamav-0.98.5/0015-bb-10731-Allow-to-specificy-a-group-for-the-socket-o.patch b/recipes-security/clamav/clamav-0.98.5/0015-bb-10731-Allow-to-specificy-a-group-for-the-socket-o.patch
deleted file mode 100644
index 8619a51..0000000
--- a/recipes-security/clamav/clamav-0.98.5/0015-bb-10731-Allow-to-specificy-a-group-for-the-socket-o.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From 9ba0bd8840f8be4cccaf8134b65a012dffdd8ae0 Mon Sep 17 00:00:00 2001
-From: Shawn Webb <swebb@sourcefire.com>
-Date: Thu, 31 Jul 2014 11:50:23 -0400
-Subject: bb#10731 - Allow to specificy a group for the socket of which the
- user is not a member
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- clamav-milter/clamav-milter.c | 193 +++++++++++++++++++++---------------------
- 1 file changed, 98 insertions(+), 95 deletions(-)
-
-diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
-index 2c7a4d7d3414..99e7fe7fac04 100644
---- a/clamav-milter/clamav-milter.c
-+++ b/clamav-milter/clamav-milter.c
-@@ -116,6 +116,104 @@ int main(int argc, char **argv) {
- 	}
-     }
- 
-+    if(!(my_socket = optget(opts, "MilterSocket")->strarg)) {
-+	logg("!Please configure the MilterSocket directive\n");
-+	logg_close();
-+	optfree(opts);
-+	return 1;
-+    }
-+
-+    if(smfi_setconn(my_socket) == MI_FAILURE) {
-+	logg("!smfi_setconn failed\n");
-+	logg_close();
-+	optfree(opts);
-+	return 1;
-+    }
-+    if(smfi_register(descr) == MI_FAILURE) {
-+	logg("!smfi_register failed\n");
-+	logg_close();
-+	optfree(opts);
-+	return 1;
-+    }
-+    opt = optget(opts, "FixStaleSocket");
-+    umsk = umask(0777); /* socket is created with 000 to avoid races */
-+    if(smfi_opensocket(opt->enabled) == MI_FAILURE) {
-+	logg("!Failed to create socket %s\n", my_socket);
-+	logg_close();
-+	optfree(opts);
-+	return 1;
-+    }
-+    umask(umsk); /* restore umask */
-+    if(strncmp(my_socket, "inet:", 5) && strncmp(my_socket, "inet6:", 6)) {
-+	/* set group ownership and perms on the local socket */
-+	char *sock_name = my_socket;
-+	mode_t sock_mode;
-+	if(!strncmp(my_socket, "unix:", 5))
-+	    sock_name += 5;
-+	if(!strncmp(my_socket, "local:", 6))
-+	    sock_name += 6;
-+	if(*my_socket == ':')
-+	    sock_name ++;
-+
-+	if(optget(opts, "MilterSocketGroup")->enabled) {
-+	    char *gname = optget(opts, "MilterSocketGroup")->strarg, *end;
-+	    gid_t sock_gid = strtol(gname, &end, 10);
-+	    if(*end) {
-+		struct group *pgrp = getgrnam(gname);
-+		if(!pgrp) {
-+		    logg("!Unknown group %s\n", gname);
-+		    logg_close();
-+		    optfree(opts);
-+		    return 1;
-+		}
-+		sock_gid = pgrp->gr_gid;
-+	    }
-+	    if(chown(sock_name, -1, sock_gid)) {
-+		logg("!Failed to change socket ownership to group %s\n", gname);
-+		logg_close();
-+		optfree(opts);
-+		return 1;
-+	    }
-+	}
-+
-+	if ((opt = optget(opts, "User"))->enabled) {
-+	    struct passwd *user;
-+	    if ((user = getpwnam(opt->strarg)) == NULL) {
-+		logg("ERROR: Can't get information about user %s.\n",
-+			opt->strarg);
-+		logg_close();
-+		optfree(opts);
-+		return 1;
-+	    }
-+
-+	    if(chown(sock_name, user->pw_uid, -1)) {
-+		logg("!Failed to change socket ownership to user %s\n", user->pw_name);
-+		optfree(opts);
-+		logg_close();
-+		return 1;
-+	    }
-+	}
-+
-+	if(optget(opts, "MilterSocketMode")->enabled) {
-+	    char *end;
-+	    sock_mode = strtol(optget(opts, "MilterSocketMode")->strarg, &end, 8);
-+	    if(*end) {
-+		logg("!Invalid MilterSocketMode %s\n", optget(opts, "MilterSocketMode")->strarg);
-+		logg_close();
-+		optfree(opts);
-+		return 1;
-+	    }
-+	} else
-+	    sock_mode = 0777 & ~umsk;
-+
-+	if(chmod(sock_name, sock_mode & 0666)) {
-+	    logg("!Cannot set milter socket permission to %s\n", optget(opts, "MilterSocketMode")->strarg);
-+	    logg_close();
-+	    optfree(opts);
-+	    return 1;
-+	}
-+    }
-+
-     if(geteuid() == 0 && (opt = optget(opts, "User"))->enabled) {
-         struct passwd *user = NULL;
- 	if((user = getpwnam(opt->strarg)) == NULL) {
-@@ -248,15 +346,6 @@ int main(int argc, char **argv) {
- 
-     multircpt = optget(opts, "SupportMultipleRecipients")->enabled;
-     
--    if(!(my_socket = optget(opts, "MilterSocket")->strarg)) {
--	logg("!Please configure the MilterSocket directive\n");
--	localnets_free();
--	whitelist_free();
--	logg_close();
--	optfree(opts);
--	return 1;
--    }
--
-     if(!optget(opts, "Foreground")->enabled) {
- 	if(daemonize() == -1) {
- 	    logg("!daemonize() failed\n");
-@@ -271,92 +360,6 @@ int main(int argc, char **argv) {
- 	    logg("^Can't change current working directory to root\n");
-     }
- 
--    if(smfi_setconn(my_socket) == MI_FAILURE) {
--	logg("!smfi_setconn failed\n");
--	localnets_free();
--	whitelist_free();
--	logg_close();
--	optfree(opts);
--	return 1;
--    }
--    if(smfi_register(descr) == MI_FAILURE) {
--	logg("!smfi_register failed\n");
--	localnets_free();
--	whitelist_free();
--	logg_close();
--	optfree(opts);
--	return 1;
--    }
--    opt = optget(opts, "FixStaleSocket");
--    umsk = umask(0777); /* socket is created with 000 to avoid races */ 
--    if(smfi_opensocket(opt->enabled) == MI_FAILURE) {
--	logg("!Failed to create socket %s\n", my_socket);
--	localnets_free();
--	whitelist_free();
--	logg_close();
--	optfree(opts);
--	return 1;
--    }
--    umask(umsk); /* restore umask */
--    if(strncmp(my_socket, "inet:", 5) && strncmp(my_socket, "inet6:", 6)) {
--	/* set group ownership and perms on the local socket */
--	char *sock_name = my_socket;
--	mode_t sock_mode;
--	if(!strncmp(my_socket, "unix:", 5))
--	    sock_name += 5;
--	if(!strncmp(my_socket, "local:", 6))
--	    sock_name += 6;
--	if(*my_socket == ':')
--	    sock_name ++;
--
--	if(optget(opts, "MilterSocketGroup")->enabled) {
--	    char *gname = optget(opts, "MilterSocketGroup")->strarg, *end;
--	    gid_t sock_gid = strtol(gname, &end, 10);
--	    if(*end) {
--		struct group *pgrp = getgrnam(gname);
--		if(!pgrp) {
--		    logg("!Unknown group %s\n", gname);
--		    localnets_free();
--		    whitelist_free();
--		    logg_close();
--		    optfree(opts);
--		    return 1;
--		}
--		sock_gid = pgrp->gr_gid;
--	    }
--	    if(chown(sock_name, -1, sock_gid)) {
--		logg("!Failed to change socket ownership to group %s\n", gname);
--		localnets_free();
--		whitelist_free();
--		logg_close();
--		optfree(opts);
--		return 1;
--	    }
--	}
--	if(optget(opts, "MilterSocketMode")->enabled) {
--	    char *end;
--	    sock_mode = strtol(optget(opts, "MilterSocketMode")->strarg, &end, 8);
--	    if(*end) {
--		logg("!Invalid MilterSocketMode %s\n", optget(opts, "MilterSocketMode")->strarg);
--		localnets_free();
--		whitelist_free();
--		logg_close();
--		optfree(opts);
--		return 1;
--	    }
--	} else
--	    sock_mode = 0777 & ~umsk;
--
--	if(chmod(sock_name, sock_mode & 0666)) {
--	    logg("!Cannot set milter socket permission to %s\n", optget(opts, "MilterSocketMode")->strarg);
--	    localnets_free();
--	    whitelist_free();
--	    logg_close();
--	    optfree(opts);
--	    return 1;
--	}
--    }
--
-     maxfilesize = optget(opts, "MaxFileSize")->numarg;
-     if(!maxfilesize) {
- 	logg("^Invalid MaxFileSize, using default (%d)\n", CLI_DEFAULT_MAXFILESIZE);