jlec 15/03/21 13:28:47 Modified: snortsam-2.70-gentoo.patch Log: Use ecvs_clean; fix linking with as-needed, #533688 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.4 net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch?r1=1.3&r2=1.4 Index: snortsam-2.70-gentoo.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- snortsam-2.70-gentoo.patch 13 Aug 2014 23:40:58 -0000 1.3 +++ snortsam-2.70-gentoo.patch 21 Mar 2015 13:28:47 -0000 1.4 @@ -1,6 +1,11 @@ + makesnortsam.sh | 66 +++++++++++++++++++++------------------------------------ + 1 file changed, 24 insertions(+), 42 deletions(-) + +diff --git a/makesnortsam.sh b/makesnortsam.sh +index 64c6eb6..37f66c9 100644 --- a/makesnortsam.sh +++ b/makesnortsam.sh -@@ -36,8 +36,7 @@ +@@ -36,8 +36,7 @@ SSP_OBSD_SRC="ssp_pf.c ssp_pf2.c" SSP_BSD_SRC="ssp_ipf.c ssp_ipfw2.c ssp_pf2.c" SSP_SUNOS_SRC="ssp_ipf.c" @@ -10,75 +15,66 @@ # OS specific flags LINUX_CFLAGS= -@@ -72,24 +71,24 @@ +@@ -72,23 +71,23 @@ case "$1" in case "${systype}" in Linux*) - gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} -+ ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ++ ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} \ ++ ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} ;; OpenBSD*) - #gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} - gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -- ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} + #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} + ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} + ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;; *BSD*) - gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -- ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} + ${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} + ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;; SunOS*) - gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ -- ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} + ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ -+ ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} + ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; esac - -@@ -104,24 +103,24 @@ +@@ -104,23 +103,23 @@ case "$1" in case "${systype}" in Linux*) - gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -- ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} + ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} + ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;; OpenBSD*) - #gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} - gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -- ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} + #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} + ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} + ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;; *BSD*) - gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -- ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} + ${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} + ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;; SunOS*) - gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ -- ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} + ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ -+ ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} + ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; esac - cd .. -@@ -152,10 +151,10 @@ +@@ -152,10 +151,10 @@ case "$1" in rm -f ${SAMTOOL}-debug case "${systype}" in @@ -93,7 +89,7 @@ esac echo "-------------------------------------------------------------------------------" -@@ -167,10 +166,10 @@ +@@ -167,10 +166,10 @@ case "$1" in SAMTOOL="${SAMTOOL}-debug" case "${systype}" in @@ -101,14 +97,14 @@ - OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; - *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; - SunOS) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; ++ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;; + OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; + *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; + SunOS) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; esac cd .. ;; -@@ -186,29 +185,12 @@ +@@ -186,29 +185,12 @@ case "$1" in rm -f ${SNORTSAM}-debug case "${systype}" in @@ -116,7 +112,7 @@ - OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;; - *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;; - SunOS*) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; ++ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;; + OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; + *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; + SunOS*) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC}-o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
