Hi,
here's an update for security/integrit. Apart from switching to RMD-160
for checksums it includes a couple of bug fixes.
In addition to the update I tweaked the port a bit:
- build with SEPARATE_BUILD=simple
- include the (small) test-suite as regression test
- include original install message as pkg/MESSAGE
- install with correct file permissions
- don't install examples to ${SYSCONFDIR}/integrit
Tested with the latest snapshot on i386 and amd64 (both inside qemu) so far.
Regards,
Oliver Klima
Index: Makefile
===================================================================
RCS file: /data/cvs/ports/security/integrit/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 1 May 2008 13:39:29 -0000 1.1.1.1
+++ Makefile 1 May 2008 13:47:50 -0000 1.2
@@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.7 2007/09/15 23:29:58 merdely Exp $
COMMENT= file integrity checker
+CATEGORIES= security
-VERSION= 3.02.00
+VERSION= 4.1
DISTNAME= integrit-${VERSION}
-PKGNAME= ${DISTNAME}p0
-CATEGORIES= security
HOMEPAGE= http://integrit.sourceforge.net/
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=integrit/} \
- http://www.noserose.net/e/integrit/download/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=integrit/}
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -18,14 +16,11 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WRKDIST= ${WRKDIR}/${DISTNAME:R}
-
CONFIGURE_STYLE= gnu
+SEPARATE_BUILD= simple
ALL_TARGET= integrit utils
-NO_REGRESS= Yes
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/integrit
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/integrit
@@ -33,5 +28,8 @@
integrit_check viewreport ${PREFIX}/share/doc/integrit
cd ${WRKSRC}/examples && ${INSTALL_DATA} *.conf \
${PREFIX}/share/examples/integrit
+
+do-regress:
+ cd ${WRKBUILD} && /bin/sh ${WRKSRC}/test/test
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /data/cvs/ports/security/integrit/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- distinfo 1 May 2008 13:39:29 -0000 1.1.1.1
+++ distinfo 1 May 2008 13:47:50 -0000 1.2
@@ -1,5 +1,5 @@
-MD5 (integrit-3.02.00.tar.gz) = Bi2wEWEYcYT3yF91Srb3pQ==
-RMD160 (integrit-3.02.00.tar.gz) = rcB2bbkaPpwz36sNSzmivdtU8uc=
-SHA1 (integrit-3.02.00.tar.gz) = eF07BS7WKsrrXEoWKjDbUOidazE=
-SHA256 (integrit-3.02.00.tar.gz) = xZ4XLpDhcaF13WgLREPNHRXkc9eBsfFQu0d9gpNWm6U=
-SIZE (integrit-3.02.00.tar.gz) = 251649
+MD5 (integrit-4.1.tar.gz) = 9RpbVYmBpdkOfW9OfiaaRg==
+RMD160 (integrit-4.1.tar.gz) = 1WWFycOMLlPxDQrWrvXqkGfd2FI=
+SHA1 (integrit-4.1.tar.gz) = i31sp80UXO/F8XkK8v0zLA8UkX0=
+SHA256 (integrit-4.1.tar.gz) = Kgm2cO4CXW+udW4ET3gMysqQaIqXGDo1CSfjiFF0Ij4=
+SIZE (integrit-4.1.tar.gz) = 271626
Index: patches/patch-Makefile_in
===================================================================
RCS file: /data/cvs/ports/security/integrit/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- patches/patch-Makefile_in 1 May 2008 13:39:29 -0000 1.1.1.1
+++ patches/patch-Makefile_in 1 May 2008 13:47:52 -0000 1.2
@@ -1,27 +1,24 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2002/11/17 00:15:19 brad Exp $
---- Makefile.in.orig Sun Sep 22 04:36:21 2002
-+++ Makefile.in Sun Sep 22 04:39:40 2002
+--- Makefile.in.orig Sat Jun 2 23:41:37 2007
++++ Makefile.in Thu May 1 13:22:06 2008
@@ -26,7 +26,7 @@ srcdir = @srcdir@
# VPATH = @srcdir@
CC = @CC@
PROG = integrit
-SBINDIR = @sbindir@
-+SBINDIR = ${PREFIX}/sbin
++SBINDIR = $(PREFIX)/sbin
INSTALL = @INSTALL@
OBJ = @OBJ@
ILIBOBJ = @ILIBOBJ@
-@@ -84,9 +84,12 @@ $(srcdir)/dep.mak ::
- fi; \
- done; \
- obj=`echo $$f | sed -e 's/^gnupg\///' -e 's/\.c\$$/.o/'`; \
-- printf "%s\n\t%s\n" \
-+ if [ "$obj" = "sha1.o" ]; then \
-+ extra_flags="-O0"; \
-+ fi; \
-+ printf "%s\n\t%s\n" \
- "$$obj : \$${srcdir}/$$f $$hdeps Makefile" \
-- "${COMPILE} \$${srcdir}/$$f"; \
-+ "${COMPILE} \$${srcdir}/$$f $extra_flags"; \
- done >> dep.mak
-
- include $(srcdir)/dep.mak
+@@ -143,9 +143,9 @@ install : $(PROG)
+ fi
+ @if test ! -d $(SBINDIR); then \
+ echo creating directory $(SBINDIR); \
+- $(INSTALL) -d -m 755 $(SBINDIR); \
++ $(INSTALL) -d -m $(DIRMODE) $(SBINDIR); \
+ fi
+- $(INSTALL) $(STRIP) -m 755 $(PROG) $(SBINDIR)/$(PROG)
++ $(INSTALL) $(STRIP) -m $(BINMODE) $(PROG) $(SBINDIR)/$(PROG)
+ @echo
+ @echo 'It is recommended that the binary be copied to a secure location
and'
+ @echo " re-copied to $(SBINDIR) at runtime or run directly"
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /data/cvs/ports/security/integrit/patches/patch-doc_Makefile_in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- patches/patch-doc_Makefile_in 1 May 2008 13:39:29 -0000 1.1.1.1
+++ patches/patch-doc_Makefile_in 1 May 2008 13:47:52 -0000 1.2
@@ -1,17 +1,45 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2002/11/17 00:15:19 brad Exp $
---- doc/Makefile.in.orig Tue Aug 27 04:55:12 2002
-+++ doc/Makefile.in Sun Sep 15 22:31:01 2002
+--- doc/Makefile.in.orig Sat Jun 2 23:41:36 2007
++++ doc/Makefile.in Thu May 1 13:18:27 2008
@@ -23,11 +23,11 @@ exec_prefix = @exec_prefix@
srcdir = @srcdir@
# we aren't using VPATH
# VPATH = @srcdir@
-MANDIR = @mandir@
-+MANDIR = ${PREFIX}/man
++MANDIR = $(PREFIX)/man
INSTALL = @INSTALL@
INSTALL_INFO = install-info
INFO_FILES = integrit.info
-infodir = @infodir@
-+infodir = ${PREFIX}/info
++infodir = $(PREFIX)/info
# target for developers puts info file in srcdir
#
+@@ -39,11 +39,11 @@ install-man :
+ @for n in 1; do \
+ if test ! -d $(MANDIR)/man$$n; then \
+ echo creating directory $(MANDIR)/man$$n; \
+- $(INSTALL) -d $(MANDIR)/man$$n; \
++ $(INSTALL) -d -m $(DIRMODE) $(MANDIR)/man$$n; \
+ fi; \
+ for f in *.$$n; do \
+ echo installing manpage $$f in $(MANDIR)/man$$n; \
+- $(INSTALL) -m 644 $$f $(MANDIR)/man$$n/$$f; \
++ $(INSTALL) -m $(MANMODE) $$f $(MANDIR)/man$$n/$$f; \
+ done; \
+ done
+
+@@ -59,11 +59,11 @@ install-man :
+ install-info :
+ @if test ! -d $(infodir); then \
+ echo creating directory $(infodir); \
+- $(INSTALL) -d $(infodir); \
++ $(INSTALL) -d -m $(DIRMODE) $(infodir); \
+ fi
+ @for f in $(INFO_FILES); do \
+ echo installing $$f in $(infodir); \
+- $(INSTALL) -m 644 $(srcdir)/$$f $(infodir); \
++ $(INSTALL) -m $(DOCMODE) $(srcdir)/$$f $(infodir); \
+ done
+ @:; iistatus=0; \
+ $(INSTALL_INFO) --version > /dev/null 2>&1; stat=$$?; \
Index: patches/patch-gnupg_md5_c
===================================================================
RCS file: patches/patch-gnupg_md5_c
diff -N patches/patch-gnupg_md5_c
--- patches/patch-gnupg_md5_c 1 May 2008 13:39:29 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-gnupg_md5_c,v 1.1 2004/01/28 22:16:12 naddy Exp $
---- gnupg/md5.c.orig 2004-01-28 22:57:29.000000000 +0100
-+++ gnupg/md5.c 2004-01-28 22:57:45.000000000 +0100
-@@ -330,8 +330,8 @@ void md5_final( MD5_CONTEXT *hd )
-
- p = hd->buf;
- #ifdef BIG_ENDIAN_HOST
-- #define X(a) do { *p++ = hd->##a ; *p++ = hd->##a >> 8; \
-- *p++ = hd->##a >> 16; *p++ = hd->##a >> 24; } while(0)
-+ #define X(a) do { *p++ = hd->a ; *p++ = hd->a >> 8; \
-+ *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0)
- #else /* little endian */
- /*#define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)*/
- /* Unixware's cpp doesn't like the above construct so we do it his way:
Index: patches/patch-utils_Makefile_in
===================================================================
RCS file: /data/cvs/ports/security/integrit/patches/patch-utils_Makefile_in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- patches/patch-utils_Makefile_in 1 May 2008 13:39:29 -0000 1.1.1.1
+++ patches/patch-utils_Makefile_in 1 May 2008 13:47:52 -0000 1.2
@@ -1,14 +1,30 @@
$OpenBSD: patch-utils_Makefile_in,v 1.1.1.1 2002/11/17 00:15:19 brad Exp $
---- utils/Makefile.in.orig Sun Sep 15 22:27:21 2002
-+++ utils/Makefile.in Sun Sep 15 22:28:27 2002
+--- utils/Makefile.in.orig Sat Jun 2 23:41:37 2007
++++ utils/Makefile.in Thu May 1 13:21:49 2008
@@ -29,8 +29,8 @@ RM = @RM@
PROGS = i-viewdb i-ls
LS_OBJ = ls.o
VIEWDB_OBJ = viewdb.o
-SBINDIR = @sbindir@
-BINDIR = @bindir@
-+SBINDIR = ${PREFIX}/sbin
-+BINDIR = ${PREFIX}/bin
++SBINDIR = $(PREFIX)/sbin
++BINDIR = $(PREFIX)/bin
INSTALL = @INSTALL@
CPPFLAGS = -I.. -I$(srcdir)/.. @CPPFLAGS@
CFLAGS = @CFLAGS@
+@@ -102,11 +102,11 @@ distclean : clean
+ install : $(PROGS)
+ @if test ! -d $(SBINDIR); then \
+ echo creating directory $(SBINDIR); \
+- $(INSTALL) -d -m 755 $(SBINDIR); \
++ $(INSTALL) -d -m $(DIRMODE) $(SBINDIR); \
+ fi
+- $(INSTALL) $(STRIP) -m 755 i-viewdb $(SBINDIR)/i-viewdb
++ $(INSTALL) $(STRIP) -m $(BINMODE) i-viewdb $(SBINDIR)/i-viewdb
+ @if test ! -d $(BINDIR); then \
+ echo creating directory $(BINDIR); \
+- $(INSTALL) -d -m 755 $(BINDIR); \
++ $(INSTALL) -d -m $(DIRMODE) $(BINDIR); \
+ fi
+- $(INSTALL) $(STRIP) -m 755 i-ls $(BINDIR)/i-ls
++ $(INSTALL) $(STRIP) -m $(BINMODE) i-ls $(BINDIR)/i-ls
Index: pkg/MESSAGE
===================================================================
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE 1 May 2008 13:47:56 -0000 1.1
@@ -0,0 +1,3 @@
+It is recommended that the binary be copied to a secure location and
+ re-copied to ${PREFIX}/sbin at runtime or run directly
+ from the secure medium.
Index: pkg/PLIST
===================================================================
RCS file: /data/cvs/ports/security/integrit/pkg/PLIST,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pkg/PLIST 1 May 2008 13:39:29 -0000 1.1.1.1
+++ pkg/PLIST 1 May 2008 13:47:56 -0000 1.2
@@ -13,10 +13,6 @@
share/doc/integrit/integrit_check
share/doc/integrit/viewreport
share/examples/integrit/
[EMAIL PROTECTED] ${SYSCONFDIR}/integrit/
share/examples/integrit/root.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/integrit/root.conf
share/examples/integrit/src.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/integrit/src.conf
share/examples/integrit/usr.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/integrit/usr.conf
