Add new TCP MD5 patch for kernels >= 2.6.20, thanks to Duncan Lockwood <dunc at lemon...

Package-Manager: portage-2.1.2.2

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 29086cd0177e028944428d3d0d2220840cdf02e1..fa011771ba5427ec1d0cb471ef1ad2ba0294a56d 100644 (file)
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.54 2007/04/13 16:32:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.55 2007/04/25 22:24:06 mrness Exp $
+
+*quagga-0.99.6-r2 (25 Apr 2007)
+
+  25 Apr 2007; Alin Năstac <mrness@gentoo.org> -quagga-0.99.6.ebuild,
+  +quagga-0.99.6-r2.ebuild:
+  Add new TCP MD5 patch for kernels >= 2.6.20, thanks to Duncan Lockwood <dunc
+  at lemonia dot org> (#175470).
 
   13 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   quagga-0.98.6-r2.ebuild:

diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index a4c599e7b90e20b1c486e26c98796e174e08d4a6..f8a55a4c1102cbab243b8ca17a1d83db7a89aeff 100644 (file)
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bgpd.init 900 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 SHA1 4e7323c366c2bfe5287e132bf8e1e7f7e79b8e43 SHA256 0625c171ec51e58175dbb59892964b5958179374947755678b2c344d98222bac
 MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900
 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 files/bgpd.init 900
@@ -37,8 +40,8 @@ SHA256 7eac27ca9661fb453a93b131bfbf69e409a06f65c2cedb83cdd55869d6871236 files/ze
 DIST quagga-0.98.6-patches-20060511.tar.gz 19251 RMD160 0c46dc9aac99a74871bf12523e4ed5de17baba01 SHA1 a44a3c7323102e483401db95723f529097256672 SHA256 bb94ec2897fac3c15454c6f25e6346be087db04ba4718cb629b7b41b63da1173
 DIST quagga-0.98.6-patches-20070412.tar.gz 21339 RMD160 25263a2f4393f6610076f4292003e7bf83ef1b3a SHA1 26ecd5ac98a2f6db7e0edc199c186a79ebf9c166 SHA256 d5f713f1720b59910731236b2b5babe8d2a7bc1074114c16e00e41d504a4c01e
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
-DIST quagga-0.99.6-patches-20070112.tar.gz 17361 RMD160 d8704b3dbb8ba550fc7aa0fa9ad6e9ee5007aac6 SHA1 b8813902cf4354fe142e54924d9a3ce70614d691 SHA256 967e31f3bc8d79a107ad619b35204c1d626fba6eb4e4fb33418f56a815c5d213
 DIST quagga-0.99.6-patches-20070412.tar.gz 18681 RMD160 98522ee7c8ac9233458c855781c9a29c81706f44 SHA1 5e668a5cecacb2fc046cf9996ff91f114490a2df SHA256 3f6886a00cb2591f909c4f180a9e258ada78721b5267ef9dc61484c58b62cde7
+DIST quagga-0.99.6-patches-20070426.tar.gz 19851 RMD160 3e6f6b53f1f9a7e00b730d53db56b905a6c37547 SHA1 b4b793f845900adb5756169da009e408df5f024c SHA256 cdda824cd42f6dfd3a1949968537bead818c065608c9e85e66868e54a7697d27
 DIST quagga-0.99.6.tar.gz 2324051 RMD160 0dbeedc6d64ea7266677e88f951adc2f63d02935 SHA1 eb35c4bf2a8da4fdf66f2a7eb7724852b0f7e017 SHA256 a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a
 EBUILD quagga-0.98.6-r1.ebuild 5089 RMD160 5651737641dbb5646a6c020e6a99acac1edd70af SHA1 e9507728c1b9c36aa76f0cc154c092b678b748fc SHA256 2982a9d62c04d4b229557198bd3e5aae6e3b070dcd5cc42e941626595a065300
 MD5 6255b83707ebb2d6d0a4bd77dbec5d71 quagga-0.98.6-r1.ebuild 5089
@@ -52,14 +55,14 @@ EBUILD quagga-0.99.6-r1.ebuild 4022 RMD160 71ca08b3ad6d7a5169e6cc6963c41ef8b270a
 MD5 3e2e923706b94a4d130053b884bbcec9 quagga-0.99.6-r1.ebuild 4022
 RMD160 71ca08b3ad6d7a5169e6cc6963c41ef8b270a0ee quagga-0.99.6-r1.ebuild 4022
 SHA256 ab6c9d481e18765a5a0a06edf311f9e26b566bee9216ce35edd7075cf3ab2ddd quagga-0.99.6-r1.ebuild 4022
-EBUILD quagga-0.99.6.ebuild 3943 RMD160 6734457d5ada5f3f1a923cd403952c92338f4ffe SHA1 831e6bfb67f7dec1f351070cd3ef947274b91862 SHA256 4e48c3b643d7fa1b929c3f5a3b5febd296325b4f13c53f7c629e918aa6fd0d38
-MD5 6a7ef034bd6a351f38d5f2c0ad797497 quagga-0.99.6.ebuild 3943
-RMD160 6734457d5ada5f3f1a923cd403952c92338f4ffe quagga-0.99.6.ebuild 3943
-SHA256 4e48c3b643d7fa1b929c3f5a3b5febd296325b4f13c53f7c629e918aa6fd0d38 quagga-0.99.6.ebuild 3943
-MISC ChangeLog 14259 RMD160 3f683c227498e50e89dbaadb39cc98dc56f8ab8a SHA1 fc9b987a9c8cc7c792b17ef2fbe5daee9e110237 SHA256 cf720984fef7b10757a8a0813065d7138b41c238a7de56935f024be9ebe2b967
-MD5 5cee5d6d509c36f00fece5aeef1f76a5 ChangeLog 14259
-RMD160 3f683c227498e50e89dbaadb39cc98dc56f8ab8a ChangeLog 14259
-SHA256 cf720984fef7b10757a8a0813065d7138b41c238a7de56935f024be9ebe2b967 ChangeLog 14259
+EBUILD quagga-0.99.6-r2.ebuild 4530 RMD160 474e0d12e1c4a3bb6411ec604b4be4eabb64b68e SHA1 2d516de37e168ec831f095b7a3124794c09f9944 SHA256 b9d5cbd26633e5fe96051cef5ecbc85af48ddaf249035df4dacd3b25e35a9a01
+MD5 56e15aa169b0f58ec0349c362426d969 quagga-0.99.6-r2.ebuild 4530
+RMD160 474e0d12e1c4a3bb6411ec604b4be4eabb64b68e quagga-0.99.6-r2.ebuild 4530
+SHA256 b9d5cbd26633e5fe96051cef5ecbc85af48ddaf249035df4dacd3b25e35a9a01 quagga-0.99.6-r2.ebuild 4530
+MISC ChangeLog 14500 RMD160 755493ab830cbebbc16c0cb59cd9c673038a47f3 SHA1 a550312e92d79b7dc618ecb79720158e079d5fec SHA256 0c9ad7b976ce63d7af36407effc4f516bf8d9d77dea5e7b705a539c03814a9a6
+MD5 c3869bc58111c5ee5f3bfc42efe7a652 ChangeLog 14500
+RMD160 755493ab830cbebbc16c0cb59cd9c673038a47f3 ChangeLog 14500
+SHA256 0c9ad7b976ce63d7af36407effc4f516bf8d9d77dea5e7b705a539c03814a9a6 ChangeLog 14500
 MISC metadata.xml 1301 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa SHA1 0d1a07e1b3821ec910b98531511f51f733915a8d SHA256 b6b92c898b68e0c1a270fbd47b91321e9a0db76068990fcbbd93ad83246b4cbb
 MD5 558920a085e2065a8aef6eca3e1896fb metadata.xml 1301
 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa metadata.xml 1301
@@ -70,9 +73,16 @@ SHA256 16c8576b8842fd33e5545deed73e9d2c4a0a3530e8e9556b567695551a714716 files/di
 MD5 c6da0bf18d4cfb3ae7bbb66f5419a3dd files/digest-quagga-0.98.6-r2 533
 RMD160 3cb563e1955d78866bc24c3e55550cc2c6ee3037 files/digest-quagga-0.98.6-r2 533
 SHA256 7b0ebb8fdc2a981af64fa6572f643290fd954224084fea2e0ed11d7051abfe19 files/digest-quagga-0.98.6-r2 533
-MD5 020249364f04aca6a99c4a884a11a344 files/digest-quagga-0.99.6 533
-RMD160 1f613d61d300c0a90644025df7e68b4845738c3e files/digest-quagga-0.99.6 533
-SHA256 9ff7f2ca0f6759755a3679f8fea920f3d205e3e7f28af0d53a54bd582333bd07 files/digest-quagga-0.99.6 533
 MD5 19e5e99d1bb4599eede48e35b2b52789 files/digest-quagga-0.99.6-r1 533
 RMD160 2f4e183cd1f2f37fe2324a4fc0d9108a1fed07ea files/digest-quagga-0.99.6-r1 533
 SHA256 84863559e220e18d5c999681c2549385cf9f95aa95ee31c59e77d727fcca9bf4 files/digest-quagga-0.99.6-r1 533
+MD5 3f67e24f678e58c60eaac85138a9936a files/digest-quagga-0.99.6-r2 533
+RMD160 018dae9bfad3792e97c4bd70ad71b63fbf25db28 files/digest-quagga-0.99.6-r2 533
+SHA256 815e6c17c24b96c1c7f518e0aeee9f424ed74e88008391f1a7037ced775016e2 files/digest-quagga-0.99.6-r2 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGL9USJnxX6mF440QRAk/6AKCeRDcBZKA8BtFgPjSba/MQN23GzwCfQJoV
+BDF1TFdyqbrOmxWxZH5IuKY=
+=9fId
+-----END PGP SIGNATURE-----

diff --git a/net-misc/quagga/files/digest-quagga-0.99.6 b/net-misc/quagga/files/digest-quagga-0.99.6
deleted file mode 100644 (file)
index e29b70e..0000000
--- a/net-misc/quagga/files/digest-quagga-0.99.6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3b7231e70a4abf40cc708650127b9495 quagga-0.99.6-patches-20070112.tar.gz 17361
-RMD160 d8704b3dbb8ba550fc7aa0fa9ad6e9ee5007aac6 quagga-0.99.6-patches-20070112.tar.gz 17361
-SHA256 967e31f3bc8d79a107ad619b35204c1d626fba6eb4e4fb33418f56a815c5d213 quagga-0.99.6-patches-20070112.tar.gz 17361
-MD5 78137ecaa66ff4c3780bd05f60e51cf5 quagga-0.99.6.tar.gz 2324051
-RMD160 0dbeedc6d64ea7266677e88f951adc2f63d02935 quagga-0.99.6.tar.gz 2324051
-SHA256 a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a quagga-0.99.6.tar.gz 2324051

diff --git a/net-misc/quagga/files/digest-quagga-0.99.6-r2 b/net-misc/quagga/files/digest-quagga-0.99.6-r2
new file mode 100644 (file)
index 0000000..5765414
--- /dev/null
+++ b/net-misc/quagga/files/digest-quagga-0.99.6-r2
@@ -0,0 +1,6 @@
+MD5 d9e890d19ff21e2a3fffc79fb7ed49fc quagga-0.99.6-patches-20070426.tar.gz 19851
+RMD160 3e6f6b53f1f9a7e00b730d53db56b905a6c37547 quagga-0.99.6-patches-20070426.tar.gz 19851
+SHA256 cdda824cd42f6dfd3a1949968537bead818c065608c9e85e66868e54a7697d27 quagga-0.99.6-patches-20070426.tar.gz 19851
+MD5 78137ecaa66ff4c3780bd05f60e51cf5 quagga-0.99.6.tar.gz 2324051
+RMD160 0dbeedc6d64ea7266677e88f951adc2f63d02935 quagga-0.99.6.tar.gz 2324051
+SHA256 a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a quagga-0.99.6.tar.gz 2324051

diff --git a/net-misc/quagga/quagga-0.99.6.ebuild b/net-misc/quagga/quagga-0.99.6-r2.ebuild
similarity index 77%
rename from net-misc/quagga/quagga-0.99.6.ebuild
rename to net-misc/quagga/quagga-0.99.6-r2.ebuild
index f14fad8cc1023ebd0e0651a069edc637d37b8382..9e0b56e83e843d47ef254120b4fc208153c3267a 100644 (file)
--- a/net-misc/quagga/quagga-0.99.6.ebuild
+++ b/net-misc/quagga/quagga-0.99.6-r2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.6.ebuild,v 1.1 2007/01/12 14:04:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.6-r2.ebuild,v 1.1 2007/04/25 22:24:06 mrness Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
 
-inherit eutils multilib autotools
+inherit eutils multilib autotools linux-info
 
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
 HOMEPAGE="http://quagga.net/"
 SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-       mirror://gentoo/${P}-patches-20070112.tar.gz"
+       mirror://gentoo/${P}-patches-20070426.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,10 +28,21 @@ src_unpack() {
        unpack ${A} || die "failed to unpack sources"
 
        cd "${S}" || die "source dir not found"
+       # Fix security quagga bug 354
+       epatch "${WORKDIR}/patch/bgpd-bug-354.diff"
        epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
 
-       # TCP MD5 for BGP patch for Linux (RFC 2385) - http://hasso.linux.ee/doku.php/english:network:rfc2385
-       use tcpmd5 && epatch "${WORKDIR}/patch/ht-20050321-0.99.6-bgp-md5_adapted.patch"
+       if use tcpmd5 ; then
+               if kernel_is lt 2 6 20 ; then
+                       # TCP MD5 for BGP patch for Linux (RFC 2385)
+                       # original found at http://hasso.linux.ee/doku.php/english:network:rfc2385
+                       epatch "${WORKDIR}/patch/ht-20050321-0.99.6-bgp-md5_adapted.patch"
+               else
+                       # TCP MD5 in-kernel support for kernels >=2.6.20 (by Leigh Brown)
+                       # original found at http://www.solinno.co.uk/md5sig/quagga_linux-2.6.20_md5sig.diff
+                       epatch "${WORKDIR}/patch/quagga_linux-2.6.20_md5sig_adapted.diff"
+               fi
+       fi
 
        # Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
        use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
@@ -114,7 +125,14 @@ pkg_postinst() {
 
        if use tcpmd5; then
                echo
-               ewarn "TCP MD5 for BGP needs a patched kernel!"
-               ewarn "See http://hasso.linux.ee/doku.php/english:network:rfc2385 for more info."
+               if kernel_is lt 2 6 20; then
+                       ewarn "TCP MD5 for BGP needs a patched kernel!"
+                       ewarn "See http://hasso.linux.ee/doku.php/english:network:rfc2385 for more info."
+               else
+                       CONFIG_CHECK="~TCP_MD5SIG"
+                       local ERROR_TCP_MD5SIG="CONFIG_TCP_MD5SIG:\t missing TCP MD5 signature support (RFC2385)"
+
+                       check_extra_config
+               fi
        fi
 }