jer 14/08/13 23:27:45 Modified: snortsam-2.70-gentoo.patch Log: Remove duplicate LDFLAGS variables. (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 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.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch?r1=1.1&r2=1.2 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- snortsam-2.70-gentoo.patch 17 Jul 2014 14:28:47 -0000 1.1 +++ snortsam-2.70-gentoo.patch 13 Aug 2014 23:27:45 -0000 1.2 @@ -17,7 +17,7 @@ - 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} ${LDFLAGS} -o ${SNORTSAM} ++ ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;; OpenBSD*) @@ -26,21 +26,21 @@ - ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} + #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a ${LDFLAGS} -o ${SNORTSAM} + ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -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} ${LDFLAGS} -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} ${LDFLAGS} -o ${SNORTSAM} ++ ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; esac @@ -51,7 +51,7 @@ - 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} ${LDFLAGS} -o ${SNORTSAM} ++ ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;; OpenBSD*) @@ -60,21 +60,21 @@ - ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} + #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a ${LDFLAGS} -o ${SNORTSAM} + ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -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} ${LDFLAGS} -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} ${LDFLAGS} -o ${SNORTSAM} ++ ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; esac cd .. @@ -86,10 +86,10 @@ - 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} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${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} ${LDFLAGS} ${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} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; ++ 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;; ++ 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 echo "-------------------------------------------------------------------------------" @@ -101,10 +101,10 @@ - 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} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${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} ${LDFLAGS} ${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} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; ++ 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;; ++ 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 .. ;; @@ -116,10 +116,10 @@ - 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} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; -+ SunOS*) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; ++ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; ++ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; ++ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; ++ SunOS*) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; esac -
