projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6432b34)
Use ecvs_clean; fix linking with as-needed, #533688
authorJustin Lecher <jlec@gentoo.org>
Sat, 21 Mar 2015 13:28:51 +0000 (13:28 +0000)
committerJustin Lecher <jlec@gentoo.org>
Sat, 21 Mar 2015 13:28:51 +0000 (13:28 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

net-analyzer/snortsam/ChangeLog patch | blob | history
net-analyzer/snortsam/Manifest patch | blob | history
net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch patch | blob | history
net-analyzer/snortsam/metadata.xml patch | blob | history
net-analyzer/snortsam/snortsam-2.50-r1.ebuild patch | blob | history
net-analyzer/snortsam/snortsam-2.70.ebuild patch | blob | history

diff --git a/net-analyzer/snortsam/ChangeLog b/net-analyzer/snortsam/ChangeLog
index 5946b0ebdbdcc22878aee7b04d62e52731cde622..26937f821275d8c253f60ee90ecf6373a8b19654 100644 (file)
--- a/net-analyzer/snortsam/ChangeLog
+++ b/net-analyzer/snortsam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/snortsam
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/ChangeLog,v 1.38 2014/08/13 23:40:58 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/ChangeLog,v 1.39 2015/03/21 13:28:47 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> files/snortsam-2.70-gentoo.patch,
+  metadata.xml, snortsam-2.50-r1.ebuild, snortsam-2.70.ebuild:
+  Use ecvs_clean; fix linking with as-needed, #533688
 
   13 Aug 2014; Jeroen Roovers <jer@gentoo.org>
   files/snortsam-2.70-gentoo.patch:
@@ -148,4 +152,3 @@
   +snortsam-2.24.ebuild:
   Initial ebuild. Requested by Patrizio Bassi <hetfield666@virgilio.it>. Closes
   #53645.
-
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
index 26451afd941d52c99bc018de0e29fc2af1bf4a99..2310915c9e0b0b8b9c600b936b9a95a544c4c959 100644 (file)
--- a/net-analyzer/snortsam/Manifest
+++ b/net-analyzer/snortsam/Manifest
@@ -1,18 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX snortsam-2.70-gentoo.patch 9062 SHA256 1dc399fccf80667e930ab3416ea3b3e96aac2a56934c3a843dac9259844efca6 SHA512 baa821b8e25d0bb7c30a220b8f0876aeba4a5e40563ffc8f467c37280b8d25b62e731387d8137eaee016c2d96540f6b76e131c6e20c06234c43aa03d7f881d1d WHIRLPOOL 8e6fa78645a14d75d77774023b730704192d87593824bcc5dd3ce640ae9e773c5702e03c446853c8f07e7caf7dcd8b6be285e525be7e712685c7f9ce93959bcf
+AUX snortsam-2.70-gentoo.patch 8979 SHA256 b90b29e805f8582376c8d6a7a1a5e960ae0e2f0112402bb207813478320ca57c SHA512 17f5b03820491ffbd8eda4b5cc99230ab358788194eb07221a303e98cc0ef5855d347804b30bd21f38d2a6f0e370f2433a691a33db0599c50887857bdadb53b6 WHIRLPOOL 81e58e4e68c9a466e443e158b36b923d70f4818e9db397d3304f01e911833581070296110d054d50ecbafea742ddc45df895767ae5565eeec9e45ee92e8cbbcb
 DIST snortsam-2.50-ciscoacl.diff.bz2 7295 SHA256 a4f39789e9f10b95e6db1bbce5f9d26f7393161311f5c955a4b8380186a2cb6b SHA512 c8b19b19721f75fb00a269923e4191a26853749658ebbec9d4c74dcbaaacb8db30a6a0bd33068a364aa95375db958b6fd45ad498abdc97029e04b7e140cb2523 WHIRLPOOL 43641d5cfc415ddc0e674a6c812ae1a5719296f8442da9cd6a2cf2a098d0fac20f790f19108442e4a171f2a30d97a7e383d827cbd48e0d07910111c6bcaa0038
 DIST snortsam-src-2.50.tar.gz 1073391 SHA256 3c77967f9ef581310de02443512fc7cd3f145249c9be765b1bcf679d408dc441 SHA512 cc4509c0d02666d6697a565e95013639a1f0c042ef948d8def92b749f249f647247ef7649ae23a2860ce58f08e310c08edeabc93301f812a98845f74ba5c266e WHIRLPOOL fbe0912028b8dc29a2c5701892316aca02b7d088bb0f1af67d1c252a640d7cd495fb17c36464b2a429b10bb489e0a1fb1ad79ff8da53267f7d41da3335a59b4c
 DIST snortsam-src-2.70.tar.gz 1971624 SHA256 442040a7281a641008f6410b7f6528d709f17d5041fd3752011075f8a38d19bc SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1 WHIRLPOOL 2ccb75cbd252b2ea293e0c125c1885ddad962b121eb095e38d85ff02d8a39803c9b0c4079b4e607e95b5c6bcaef388fed4106247714182ce01bb0e44e86c91c1
-EBUILD snortsam-2.50-r1.ebuild 1472 SHA256 d8a16b3b67cafe445f7b8850fd6c0fffa416bf9042542baf38a61e3a5e3ef2de SHA512 a7ea8ea047b60c88bf16a6aa57ad409e44edf912fb1adf17667278bce99d3cd5c910206cff6a69e7c919ec0973fd9c65362c5513f72bca064c026e0142dc79c5 WHIRLPOOL 93cf742cddb1146ccd3032367f3e07730dfaa61604a3e7eccafeed3cb1054b7b4e359ca208ff7e1629f13391bcc616bf0d16c71f7375c1a6e8119c7c69d63772
-EBUILD snortsam-2.70.ebuild 1169 SHA256 686ccb544161f4e1cc51c482ca1480b4e44ca80f2e4a3b84ce0622f1620ab86b SHA512 c66fc2d6deab79847261d80d737eebb78beec63abb10327ab8e9e005b4c01dbfe87bb9da50708d049e3a247259fc624e9db0d2a0491a0645a315509d63547c74 WHIRLPOOL e2c4faf66ccecbacb407c467ab7f27b50fa739865658b25b32210a7f1cafb1c13fd4b5d66a20e0f7edc3658d16ced7e19d32f122116e51fe646a72fffbc3f1fd
-MISC ChangeLog 5054 SHA256 db3015e5106b07e7e4dc1037a65952bd32f73f9761a66c7a5891848951ecf541 SHA512 27926ed2f65f0c1864753822beed7daf3c9be6280cd4610330f6fcdb881ecb78f71fbe3aa3250b4282e3a506f41033a56544c640119d2ddb13e2ed211386de50 WHIRLPOOL ddbe9adc0b1d5884ab7d799c4ad85958d23f9d340f047fa9dd6dd5c429eb11bb2982dba9b3e8c7187617c4717371bee341d95604f7b84d682df3472d7402f6f4
-MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+EBUILD snortsam-2.50-r1.ebuild 1427 SHA256 d5abc3f5d433e5b9a3217b59f5a9ba658d228c7c1f6f1998171a4540dc143bb1 SHA512 c6dd6d940167baf53cb3fb3896d053d6b6336f2566edb5b07c4c652892b4e9af50087db021212acad61b2391b0c82d730bbdfd4688fd0cae474ad7eb1448a05e WHIRLPOOL 5a98f4b27996d614a59ad0589b175899dadf81e957915b62a48ee176397033bd9af620cdc960f1e41e059922aeb0710f01f483367c52fbe47b1cae1f98d9767e
+EBUILD snortsam-2.70.ebuild 1123 SHA256 a45e1aaa141d4e7d032b12d155826d463de6de10b7b36a8b5839972df6d1e60a SHA512 df789eb21cafc8fffccafe49bf83a88207f9c5e1f1692329b5d56759fb530209a9de5ab2340c36823bec79870e8c705ce6b32084fc0c825e67d5e55c6a004d9d WHIRLPOOL c705d48f2f121c382c6b9fa7a895a6b07c1e1a2d52f5aa2528868c798d74aa9de102ab1f9ff1222ebc72f58affed25d4884dd10283280f2551e93d885c04a3b5
+MISC ChangeLog 5253 SHA256 9c0cfb484429ad1d78c41d44dd29bee7952c57fe692a449880f663e4d19281ae SHA512 74616743c03dcbb63e91364e3db59730037e62ba2610de94b910201733cc30a04ed1b2f6d0ceb3e5355a3ed88335a8da4b6480729068372ede3c6c3424453957 WHIRLPOOL c937d015bdcbde8b98abb9888509105e5080a694a23da8b817e89b9de05b8cfcb8d986ac944f2ce922a9ea3bde9d387b7630f55dbc37ec9894d55723719a9c39
+MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPr94wACgkQVWmRsqeSphMqxQCfRFNFu6VQcNfxtRJki0DGpNaj
-VCUAn2CK7/5Ganjwk09SgSz9hAQzZV4f
-=z2bD
+iQJ8BAEBCgBmBQJVDXITXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirOfAP/1USgowWK07tgr8YlzpuHGDm
+C3N1g/UuW60g27D2ieVNaQ+ARf+L4JVBpRyHy7ujeDE7YiLyuGwDmPajSMf9iWVt
+piVy3lI13A+hzy9jNtqWi9KRHk8tGXp+wHKKknhue4vdRRP/tH2ELhDtYs6FMcUl
+DxiYbDayoPGJyUC1MSeU/XM3hSEW2sPBCoslKJjR+40e0jiR2a98xyf5nuA1ZxAL
+3Gu/Pr9zysLfParycZU6Jq2sNeMdCbE1G/B9MUaSk+4Ln3bSceBPUQsBicE3eeet
+N2M/0Lr8hrULjgt1UnnDyvnSinPvHfNwwdUDSsOudpaoEkwP0aOeOkFnE2rdJlnv
+7n4b+5vEMnvrElOiS9aXC8A97pORpeabJqHFNXBm42TBoZqXZhr1mIL6JCxsp3ws
+WrABQegGcl5+/NfZzkTTx7fR56UnAct8K8CoZH+eefZ4/iQxANPgmBP19oKWOMRw
+mioU0IxEvhKEfgrkicTIWPi7nWaGSmJLUYHPhg5T69n14epHG+KtDErcSyGNfGaL
+TTt/+qG3cAM3z6tobk7XFuda+qAR1uZQzSPnF8rPB9o1i1QMso3czbL8w8tj9GRF
+94mXzuWrP7ZbB7KjqeNRt+C4biCgJHDUmkquEOdfrJ28XyRgCNxGFtId8FeACqPU
+MDL5BGeeAbHzNpzNJMvQ
+=SHcI
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
index 427474adf3c11a424d6ee847a33b61714c28de50..f2d8fd330d330a9613480cc187ba19e77876e5af 100644 (file)
--- a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
+++ b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
@@ -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;;
diff --git a/net-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml
index 03aa50bab7e33a226c5d71690e0e01a920c3438e..43ff75467369ccf4816f8cf87f18b2d6bc9dd6a9 100644 (file)
--- a/net-analyzer/snortsam/metadata.xml
+++ b/net-analyzer/snortsam/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+  <herd>netmon</herd>
 </pkgmetadata>
diff --git a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
index aa1420199aad1cc90d3fe13a6db3d688577a10f5..a48cb499db1230aeda654804b907e7ec245b3727 100644 (file)
--- a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.50-r1.ebuild,v 1.13 2014/07/17 14:28:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.50-r1.ebuild,v 1.14 2015/03/21 13:28:47 jlec Exp $
 
 inherit eutils toolchain-funcs
 
@@ -26,7 +26,7 @@ src_unpack() {
                        -e "s: -O2 : ${CFLAGS} :" \
                        -e "s:gcc :$(tc-getCC) :" \
                        -e "s:\( -o ../snortsam\): ${LDFLAGS}\1:" makesnortsam.sh || die "sed failed"
-       find "${S}" -depth -type d -name CVS -exec rm -rf \{\} \;
+               ecvs_clean
 }
 
 src_compile() {
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild
index 202fb835021f03a69ddf223e991032e2085cc6a5..e2c2c9fc80cd69e431b6c0b1059a033113f3b14f 100644 (file)
--- a/net-analyzer/snortsam/snortsam-2.70.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.70.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.70.ebuild,v 1.6 2014/07/17 14:31:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.70.ebuild,v 1.7 2015/03/21 13:28:47 jlec Exp $
 
 EAPI=5
+
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
@@ -18,8 +19,7 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-gentoo.patch
-
-       find "${S}" -depth -type d -name CVS -exec rm -rf \{\} \;
+       ecvs_clean
 }
 
 src_configure() {
@@ -38,9 +38,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       elog
+       echo
        elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
        elog "Read the INSTALL file to configure snort for snortsam, and configure"
        elog "snortsam for your particular firewall."
-       elog
+       echo
 }
Unnamed repository; edit this file 'description' to name the repository.