- Updating the Osiris integrity checking system to 4.2.1. This version includes

the format string exploit fixes that were also in the patch in 4.2.0_1 (hence
removed).
- Also updating master site to the new official one.

PR:		ports/100952
Submitted by:	David Thiel (maintainer)

3 files changed, 5 insertions, 72 deletions

diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index 498caba..6409802 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	osiris
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.2.1
 CATEGORIES=	security
-MASTER_SITES=	http://www.hostintegrity.com/osiris/data/ \
+MASTER_SITES=	http://osiris.shmoo.com/data/ \
 		http://redundancy.redundancy.org/mirror/
 
 MAINTAINER=	lx@redundancy.redundancy.org
diff --git a/security/osiris/distinfo b/security/osiris/distinfo
index f2fd3e5..21fde7f 100644
--- a/security/osiris/distinfo
+++ b/security/osiris/distinfo
@@ -1,3 +1,3 @@
-MD5 (osiris-4.2.0.tar.gz) = ad30995660e506ee6d1d6460601f6107
-SHA256 (osiris-4.2.0.tar.gz) = 6c6d2be382450fc31e288dce397ed4b68f23907efb0782a8ed2a68780db0025d
-SIZE (osiris-4.2.0.tar.gz) = 1922195
+MD5 (osiris-4.2.1.tar.gz) = 11445f7d8dec737f0be89357f5c5bcae
+SHA256 (osiris-4.2.1.tar.gz) = 36e0c94b66b37cd8944c80163fe827a4fe53f32f10a0bcfc837de9cca42b1fc9
+SIZE (osiris-4.2.1.tar.gz) = 3849917
diff --git a/security/osiris/files/patch-logging b/security/osiris/files/patch-logging
deleted file mode 100644
index 208aa58..0000000
--- a/security/osiris/files/patch-logging
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/osirisd/logging.c
-+++ src/osirisd/logging.c
-@@ -93,7 +93,7 @@
-             fprintf( stdout, "\n" );
-         }
- #else
--    syslog( ( SYSLOG_FACILITY | LOG_ERR ), header );
-+    syslog( ( SYSLOG_FACILITY | LOG_ERR ), "%s", header );
- #endif
- }
- 
-@@ -147,7 +147,7 @@
-             fprintf( stdout, "\n" );
-         }
- #else
--    syslog( ( SYSLOG_FACILITY | LOG_INFO ), header );
-+    syslog( ( SYSLOG_FACILITY | LOG_INFO ), "%s", header );
- #endif
- }
- 
-@@ -201,7 +201,7 @@
-             fprintf( stdout, "\n" );
-         }
- #else
--    syslog( ( SYSLOG_FACILITY | LOG_WARNING ), header );
-+    syslog( ( SYSLOG_FACILITY | LOG_WARNING ), "%s", header );
- #endif
- }
- 
---- src/osirismd/logging.c
-+++ src/osirismd/logging.c
-@@ -106,7 +106,7 @@
-             fprintf( stdout, "\n" );
-         }
- #else
--    syslog( ( syslog_facility | LOG_ERR ), header );
-+    syslog( ( syslog_facility | LOG_ERR ), "%s", header );
- #endif
- }
- 
-@@ -168,7 +168,7 @@
-             fprintf( stdout, "\n" );
-         }
- #else
--    syslog( ( syslog_facility | LOG_INFO ), header );
-+    syslog( ( syslog_facility | LOG_INFO ), "%s", header );
- #endif
- }
- 
-@@ -230,7 +230,7 @@
-             fprintf( stdout, "\n" );
-         }
- #else
--    syslog( ( syslog_facility | LOG_WARNING ), header );
-+    syslog( ( syslog_facility | LOG_WARNING ), "%s", header );
- #endif
- }
- 
-@@ -281,7 +281,7 @@
-                     NULL);                /* no raw data */
-         }
- #else
--        syslog( ( syslog_facility | LOG_INFO ), buffer );
-+        syslog( ( syslog_facility | LOG_INFO ), "%s", buffer );
- #endif
-     }