Date: Sat, 19 Apr 2014 02:36:26 GMT From: Sacha Clayton <bsd@chlytor.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/188781: [PATCH] Update to 2.7.1; Fix compile under 10.0; Become maintainer Message-ID: <201404190236.s3J2aQPr042208@cgiserv.freebsd.org> Resent-Message-ID: <201404190240.s3J2e0x3006994@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188781 >Category: ports >Synopsis: [PATCH] Update to 2.7.1; Fix compile under 10.0; Become maintainer >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 19 02:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Sacha Clayton >Release: 10.0-release >Organization: >Environment: FreeBSD 10-0.case.witopia.net 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: I would like to become the maintainer of this port. This patch does this and fixes the following issues: * Update to 2.7.1 (from 2.7) * Fix compile under clang / FreeBSD 10.0-release merges patches from https://github.com/ossec/ossec-hids/pull/132 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN ossec-hids-server.orig/Makefile ossec-hids-server/Makefile --- ossec-hids-server.orig/Makefile 2014-04-15 17:48:55.000000000 +0000 +++ ossec-hids-server/Makefile 2014-04-18 18:29:26.000000000 +0000 @@ -2,14 +2,13 @@ # $FreeBSD: head/security/ossec-hids-server/Makefile 340722 2014-01-22 17:00:46Z mat $ PORTNAME= ossec-hids -PORTVERSION= 2.7 +PORTVERSION= 2.7.1 PORTREVISION?= 0 CATEGORIES= security -MASTER_SITES= http://www.ossec.net/files/ \ - http://www.ossec.net/files/old/ +MASTER_SITES= http://www.ossec.net/files/ PKGNAMESUFFIX= -server -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bsd@chlytor.net COMMENT?= A security tool to monitor and check logs and intrusions USE_RC_SUBR= ossec-hids diff -urN ossec-hids-server.orig/distinfo ossec-hids-server/distinfo --- ossec-hids-server.orig/distinfo 2014-04-15 17:48:55.000000000 +0000 +++ ossec-hids-server/distinfo 2014-04-18 18:30:01.000000000 +0000 @@ -1,2 +1,2 @@ -SHA256 (ossec-hids-2.7.tar.gz) = f8ac4a7d74068a8ca4f14e3c906bfa3a68a87fd026b463422bea79fe9d747249 -SIZE (ossec-hids-2.7.tar.gz) = 818656 +SHA256 (ossec-hids-2.7.1.tar.gz) = a81d11cd6c3f21058968f5c72c25b160d3218ea28d648d8abd6a78f4ae4196ec +SIZE (ossec-hids-2.7.1.tar.gz) = 837818 diff -urN ossec-hids-server.orig/files/patch-install.sh ossec-hids-server/files/patch-install.sh --- ossec-hids-server.orig/files/patch-install.sh 1970-01-01 00:00:00.000000000 +0000 +++ ossec-hids-server/files/patch-install.sh 2014-04-18 18:53:36.000000000 +0000 @@ -0,0 +1,50 @@ +--- ./install.sh.orig 2013-10-29 18:13:44.000000000 +0000 ++++ ./install.sh 2014-04-18 18:41:06.000000000 +0000 +@@ -11,7 +11,7 @@ + # Changelog 15/07/2006 - Rafael M. Capovilla <under@underlinux.com.br> + # New function AddTable to add support for OpenBSD pf rules in firewall-drop active response + +-# Changelog 29 March 2012 - Adding hybrid mode (standalone + agent) ++# Changelog 29 March 2012 - Adding hybrid mode (standalone + agent) + + + +@@ -67,9 +67,6 @@ + echo "5- ${installing}" + + echo "DIR=\"${INSTALLDIR}\"" > ${LOCATION} +- echo "CC=${CC}" >> ${LOCATION} +- echo "GCC=${CC}" >> ${LOCATION} +- echo "CLANG=clang" >> ${LOCATION} + + # Changing Config.OS with the new C flags + # Checking if debug is enabled +@@ -344,7 +341,7 @@ + echo " </localfile>" >> $NEWCONFIG + fi + +- ++ + + + echo "" +@@ -811,19 +808,6 @@ + export PATH + fi + +- ls "`which gcc`" > /dev/null 2>&1 +- if [ ! $? = 0 ]; then +- ls "`which cc`" > /dev/null 2>&1 +- if [ ! $? = 0 ]; then +- if [ "X${USER_BINARYINSTALL}" = "X" ]; then +- catError "0x3-dependencies" +- fi +- fi +- CC="cc" +- else +- CC="gcc" +- fi +- + PATH=$OLDOPATH + export PATH + } diff -urN ossec-hids-server.orig/files/patch-src__Config.Make ossec-hids-server/files/patch-src__Config.Make --- ossec-hids-server.orig/files/patch-src__Config.Make 1970-01-01 00:00:00.000000000 +0000 +++ ossec-hids-server/files/patch-src__Config.Make 2014-04-18 18:53:36.000000000 +0000 @@ -0,0 +1,10 @@ +--- ./src/Config.Make.orig 2013-10-29 18:13:44.000000000 +0000 ++++ ./src/Config.Make 2014-04-18 18:42:10.000000000 +0000 +@@ -8,6 +8,7 @@ + include ${PT}Config.OS + + ++CC?=cc + CFLAGS = -g -Wall -I${PT} -I${PT}headers ${CPATH} ${CEXTRA} ${DEXTRA} ${EEXTRA} ${FEXTRA} ${GEXTRA} ${HEXTRA} ${CGEOIP} -DARGV0=\"${NAME}\" -DXML_VAR=\"var\" -DOSSECHIDS + + SOURCES = *.c diff -urN ossec-hids-server.orig/files/patch-src__InstallServer.sh ossec-hids-server/files/patch-src__InstallServer.sh --- ossec-hids-server.orig/files/patch-src__InstallServer.sh 2014-04-15 17:48:55.000000000 +0000 +++ ossec-hids-server/files/patch-src__InstallServer.sh 2014-04-18 18:53:36.000000000 +0000 @@ -1,5 +1,5 @@ ---- ./src/InstallServer.sh.orig 2012-11-08 21:24:55.000000000 -0500 -+++ ./src/InstallServer.sh 2013-01-14 10:44:36.000000000 -0500 +--- ./src/InstallServer.sh.orig 2014-04-18 18:50:21.000000000 +0000 ++++ ./src/InstallServer.sh 2014-04-18 18:31:03.000000000 +0000 @@ -195,7 +195,7 @@ fi fi @@ -9,7 +9,7 @@ find ${DIR}/rules/ -type f -exec chmod 440 {} \; # If the local_rules is saved, moved it back -@@ -318,12 +318,12 @@ +@@ -326,12 +326,12 @@ ls ../etc/ossec.mc > /dev/null 2>&1 if [ $? = 0 ]; then diff -urN ossec-hids-server.orig/files/patch-src__LOCATION ossec-hids-server/files/patch-src__LOCATION --- ossec-hids-server.orig/files/patch-src__LOCATION 2014-04-15 17:48:55.000000000 +0000 +++ ossec-hids-server/files/patch-src__LOCATION 2014-04-18 19:02:44.000000000 +0000 @@ -1,7 +1,8 @@ -diff -ruN src/LOCATION.orig src/LOCATION ---- src/LOCATION.orig Tue Oct 25 18:18:50 2005 -+++ src/LOCATION Mon Apr 2 10:51:37 2007 -@@ -1,2 +1,2 @@ +--- ./src/LOCATION.orig 2014-04-18 18:48:18.000000000 +0000 ++++ ./src/LOCATION 2014-04-18 18:41:06.000000000 +0000 +@@ -1,4 +1 @@ -DIR="/var/ossec" +-CC=gcc +-GCC=gcc +-CLANG=clang +DIR="PREFIX" - CC=gcc diff -urN ossec-hids-server.orig/files/patch-src__Makeall ossec-hids-server/files/patch-src__Makeall --- ossec-hids-server.orig/files/patch-src__Makeall 1970-01-01 00:00:00.000000000 +0000 +++ ossec-hids-server/files/patch-src__Makeall 2014-04-18 18:53:36.000000000 +0000 @@ -0,0 +1,11 @@ +--- ./src/Makeall.orig 2013-10-29 18:13:44.000000000 +0000 ++++ ./src/Makeall 2014-04-18 18:41:06.000000000 +0000 +@@ -104,7 +104,7 @@ + else + + echo 'int main() { short one = 1; char *cp = (char*)&one; if ( *cp == 0 ) return(1); else return(0); }' > isbigendian.c +- gcc -o isbigendian isbigendian.c ++ cc -o isbigendian isbigendian.c + ./isbigendian + if [ $? = 1 ]; then + echo "INFO: Big endian set." diff -urN ossec-hids-server.orig/files/patch-src__Makefile ossec-hids-server/files/patch-src__Makefile --- ossec-hids-server.orig/files/patch-src__Makefile 1970-01-01 00:00:00.000000000 +0000 +++ ossec-hids-server/files/patch-src__Makefile 2014-04-18 18:53:36.000000000 +0000 @@ -0,0 +1,23 @@ +--- ./src/Makefile.orig 2013-10-29 18:13:44.000000000 +0000 ++++ ./src/Makefile 2014-04-18 18:41:06.000000000 +0000 +@@ -47,14 +47,14 @@ + @echo "CEXTRA=-DCLIENT" >> ./Config.OS + + setclang: +- @mv LOCATION LOCATION.backup +- @sed -e "s/^CC=.*/CC=clang/g" LOCATION.backup > LOCATION +- @rm LOCATION.backup ++ @mv Config.Make Config.Make.backup ++ @sed -e "s/^CC?=.*/CC=clang/g" Config.Make.backup > Config.Make ++ @rm Config.Make.backup + + unsetclang: +- @mv LOCATION LOCATION.backup +- @sed -e "s/^CC=.*/CC=gcc/g" LOCATION.backup > LOCATION +- @rm LOCATION.backup ++ @mv Config.Make Config.Make.backup ++ @sed -e "s/^CC=clang/CC?=cc/g" Config.Make.backup > Config.Make ++ @rm Config.Make.backup + + setprelude: + @echo "CPRELUDE=-DPRELUDE -lprelude `libprelude-config --pthread-cflags` `libprelude-config --libs`" >> ./Config.OS diff -urN ossec-hids-server.orig/files/patch-src__headers__defs.h ossec-hids-server/files/patch-src__headers__defs.h --- ossec-hids-server.orig/files/patch-src__headers__defs.h 2014-04-15 17:48:55.000000000 +0000 +++ ossec-hids-server/files/patch-src__headers__defs.h 2014-04-18 19:03:09.000000000 +0000 @@ -1,9 +1,8 @@ -diff -ruN src/headers/defs.h.orig src/headers/defs.h ---- src/headers/defs.h.orig Thu Feb 22 01:44:26 2007 -+++ src/headers/defs.h Mon Apr 2 10:54:45 2007 -@@ -86,7 +86,7 @@ - #endif - +--- ./src/headers/defs.h.orig 2014-04-18 18:51:41.000000000 +0000 ++++ ./src/headers/defs.h 2014-04-18 18:31:03.000000000 +0000 +@@ -98,7 +98,7 @@ + #endif + #ifndef DEFAULTDIR - #define DEFAULTDIR "/var/ossec" + #define DEFAULTDIR "PREFIX" diff -urN ossec-hids-server.orig/files/patch-src__init__shared.sh ossec-hids-server/files/patch-src__init__shared.sh --- ossec-hids-server.orig/files/patch-src__init__shared.sh 1970-01-01 00:00:00.000000000 +0000 +++ ossec-hids-server/files/patch-src__init__shared.sh 2014-04-18 18:53:36.000000000 +0000 @@ -0,0 +1,10 @@ +--- ./src/init/shared.sh.orig 2013-10-29 18:13:44.000000000 +0000 ++++ ./src/init/shared.sh 2014-04-18 18:41:06.000000000 +0000 +@@ -28,7 +28,6 @@ + NAMESERVERS=`cat /etc/resolv.conf | grep "^nameserver" | cut -d " " -sf 2` + NAMESERVERS2=`cat /etc/resolv.conf | grep "^nameserver" | cut -sf 2` + HOST_CMD=`which host` +-CC="" + NAME="OSSEC HIDS" + INSTYPE="server" + DEFAULT_DIR=`grep DIR ${LOCATION} | cut -f2 -d\"` diff -urN ossec-hids-server.orig/files/patch-src__os_crypto__sha1__Makefile ossec-hids-server/files/patch-src__os_crypto__sha1__Makefile --- ossec-hids-server.orig/files/patch-src__os_crypto__sha1__Makefile 1970-01-01 00:00:00.000000000 +0000 +++ ossec-hids-server/files/patch-src__os_crypto__sha1__Makefile 2014-04-18 18:53:36.000000000 +0000 @@ -0,0 +1,11 @@ +--- ./src/os_crypto/sha1/Makefile.orig 2013-10-29 18:13:44.000000000 +0000 ++++ ./src/os_crypto/sha1/Makefile 2014-04-18 18:41:06.000000000 +0000 +@@ -9,8 +9,6 @@ + + SRCS = sha1_op.c + sha1_OBJS = sha1_op.o +-CC=$(GCC) +- + + sha1: + $(CC) $(CFLAGS) -c $(SRCS) diff -urN ossec-hids-server.orig/files/patch-src__os_crypto__sha1__md32_common.h ossec-hids-server/files/patch-src__os_crypto__sha1__md32_common.h --- ossec-hids-server.orig/files/patch-src__os_crypto__sha1__md32_common.h 1970-01-01 00:00:00.000000000 +0000 +++ ossec-hids-server/files/patch-src__os_crypto__sha1__md32_common.h 2014-04-18 18:53:36.000000000 +0000 @@ -0,0 +1,11 @@ +--- ./src/os_crypto/sha1/md32_common.h.orig 2013-10-29 18:13:44.000000000 +0000 ++++ ./src/os_crypto/sha1/md32_common.h 2014-04-18 18:41:06.000000000 +0000 +@@ -607,7 +607,7 @@ + } + + #ifndef MD32_REG_T +-#define MD32_REG_T long ++#define MD32_REG_T int + /* + * This comment was originaly written for MD5, which is why it + * discusses A-D. But it basically applies to all 32-bit digests, diff -urN ossec-hids-server.orig/files/patch-src__rootcheck__check_rc_ports.c ossec-hids-server/files/patch-src__rootcheck__check_rc_ports.c --- ossec-hids-server.orig/files/patch-src__rootcheck__check_rc_ports.c 1970-01-01 00:00:00.000000000 +0000 +++ ossec-hids-server/files/patch-src__rootcheck__check_rc_ports.c 2014-04-18 18:53:36.000000000 +0000 @@ -0,0 +1,10 @@ +--- ./src/rootcheck/check_rc_ports.c.orig 2013-10-29 18:13:44.000000000 +0000 ++++ ./src/rootcheck/check_rc_ports.c 2014-04-18 18:41:06.000000000 +0000 +@@ -86,7 +86,6 @@ + return(0); + } + +- + memset(&server, 0, sizeof(server)); + server.sin_family = AF_INET; + server.sin_port = htons( port ); >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404190236.s3J2aQPr042208>