summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-12-04 06:49:15 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-12-04 06:49:15 +0000
commite7db2ecf29d9a7668733dc04ce89512cc9d3110e (patch)
treed5ba298d85545b44fe091b77d5b38a13060c4ff1
parentfixed homepage and post-install message (diff)
downloadhistorical-e7db2ecf29d9a7668733dc04ce89512cc9d3110e.tar.gz
historical-e7db2ecf29d9a7668733dc04ce89512cc9d3110e.tar.bz2
historical-e7db2ecf29d9a7668733dc04ce89512cc9d3110e.zip
Version bump by arfrever (bug #531622). Removed old
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
-rw-r--r--dev-libs/nss/ChangeLog8
-rw-r--r--dev-libs/nss/Manifest26
-rw-r--r--dev-libs/nss/nss-3.16.3.ebuild320
-rw-r--r--dev-libs/nss/nss-3.16.ebuild270
-rw-r--r--dev-libs/nss/nss-3.17.3.ebuild (renamed from dev-libs/nss/nss-3.17.1.ebuild)2
5 files changed, 24 insertions, 602 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index d61b897e6c2c..49fd2461232e 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/nss
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.392 2014/11/04 20:00:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.393 2014/12/04 06:49:14 polynomial-c Exp $
+
+*nss-3.17.3 (04 Dec 2014)
+
+ 04 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -nss-3.16.ebuild,
+ -nss-3.16.3.ebuild, -nss-3.17.1.ebuild, +nss-3.17.3.ebuild:
+ Version bump by arfrever (bug #531622). Removed old.
04 Nov 2014; Markus Meier <maekke@gentoo.org> nss-3.16.5.ebuild:
arm stable, bug #523652
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index eb0072b6fd19..cbc58a5f1f0d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,27 +10,33 @@ AUX nss-3.17.1-gentoo-fixups.patch 5415 SHA256 b28efbafe7be3adec9fba08fa79e28052
DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
DIST nss-3.15.4-pem-support-20140109.patch.xz 28400 SHA256 bcdd3decd9a7e33e240af899ead32fb92c9bf623bc99fc4b60ca4e08bcf92b82 SHA512 59066b73357ae96d3f18749b8f3bd07548d8f5e6a7b8b1f2bf227ac95ee6d3ad8ccfa60471de41f7b73f37db8e80e948c34109c69e96e958be094140e026504e WHIRLPOOL b08f463a6f699957737f3d7dda8e25e15658097d8a538c2596b94c55777afdf6526ab041e617c54ae709bdce4f1acc2aa19da619eb98e128a1d0cd0dc1de230d
DIST nss-3.15.4.tar.gz 6366271 SHA256 14d69a0735c5af6b3cc12591f7ebf272203e889f09104182148091d0af682d7c SHA512 21ca81b636f7e230715556bc874d5c1c4f370c6fe57a39cb12fa349d0414a88e13aa931060613a793f7267868e026eaf167cbab5f2a5e8759e7a4b176d97fc6a WHIRLPOOL 7ebf8a60e7db5ee8e90137430f1b97d591fc11d02771aac027a1ff702f17ff74a8c78f4f77fb92aab1d10d6e0ff63d2e72e4bbf3d489ba60d778cb02868c2ec6
-DIST nss-3.16.3.tar.gz 6426732 SHA256 657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60 SHA512 2e829b021319a9d8c0cedec742f84c54815eed8e3b1042b5045f08746e5768286001e9517d2b69c2a5d705cd632c98f3a9227e651a492bae3ef638cc706fe31f WHIRLPOOL bd8fe296baf79b4cad2224a921bf6d0a6b6a1f13df5b64131f59964541d2ec1ae506a79a5a3b8dc08a47c8fcdfa5eafb866727fcf26c37d4e5e91a7ebb7886b3
DIST nss-3.16.5.tar.gz 6429830 SHA256 e744b9fb2a6291d7eaf1b3f0157082f4214984db33f896e4adf3141340d64196 SHA512 687513e2e4ac8139d045a9f4af3440db0dbcd1e8b1834da1a1a3c9f948929c00464b2a6e857bc9f83125df52f30d1ed91786f22fcdf24f148a7ed5cc474f0c75 WHIRLPOOL 77b484b55e39f97de639b7f40ad66a79b6931528374d0dfa6afaec4bc0f11280ffd0ffc5ba342d64541e0ea59659e99f2c8bf5181f9b34e095bda2321e42b3d4
DIST nss-3.16.6.tar.gz 6429976 SHA256 955b4cd8c5769d94b0455767efbe315ca6956ba24c15a3494e62fcccc989e752 SHA512 c629d4810b23db5af4818573dc3b10ca3f99072aa679f1df930cbd16ebcc529e9fd77ccf1aeabc821cd8f8cd3e452e06ace8ef10ade173ae91a0c91134bc281e WHIRLPOOL 6c611b61430591887dfb5a4c5196a18bf1e656986671b65d253a5999f5304422b5cad8d8c12411b35580c52104ae501e3e8c0b857486659bd7b0aa8697bfe016
-DIST nss-3.16.tar.gz 6378110 SHA256 2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 SHA512 e3dcde8213f7f131fe2f714ff2f45c6d7b9b2167e51dbf0e1a750cc4f83d9fa35e69408850de6600f55fbc9e26b29dc344548cb64849d6e3252476eadd7ee57f WHIRLPOOL d30b53ec36cacff9756b43780d904e32760cd5d0b75f1888b6fb80e0a87ce828f4e6189de63880ddce90bdf5d90123ff7e9fdf600f4df02ce59702898f08c11e
-DIST nss-3.17.1.tar.gz 6927105 SHA256 0e210afba7cd1e033a08f61fcd1f466639649fc413e72aa050f3d52c19376e5f SHA512 398b2af3f358ba687a24fdd97cbf77cc22c36c6b6dc4bd72307a8108a503428c0e92567c4665366062206826827905cea2304ba98673333098ee2da8ffcfd3a4 WHIRLPOOL 417352164e92120669a12a236530d692c987b5cd60b6035d30dd26ed5d950cccbc169c6f0ac6451253dfad3febfdde9dac7f73d06806f9455430f92ccbe2b487
DIST nss-3.17.2.tar.gz 6927414 SHA256 134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b SHA512 a3d165bb2c578e7b5d90349729e85a2fce09260d069093080c76cce3b8a996c6489232324fd6a0c69b959321bcdf5f1806054f165cd6ce851fe4ffeb2883ae7f WHIRLPOOL 01b3cc546aa2dd0974caa2267aa9874b01cf6096f307a114393ba5a98adc216e0f2b217631b89b20752be5881f70fc1a7e94e0e90618707d5f9b9d18fd55d859
+DIST nss-3.17.3.tar.gz 6932021 SHA256 f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5 SHA512 828d3d495492bed020d819790b439a912e5a997a2e38dd2b3b27f5d92989960984b758fffe410fc82165dea2c138125571a992f6b90596f599bfb5636d0ccaaf WHIRLPOOL f450eefbd2a64fe0cde12188ff6b1e21d649528e06f3d9303f28147cfee77aa085bd83746a7b5ccb1a1c57599688e05a214ef6e0eac79c9c8d1e3958aa7a1542
DIST nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 27506 SHA256 50d9ec26a75835e900302f631456e278e13d4b435b8f98aa69f79dd439ddc6ab SHA512 0158a140f112a905f7db5a4f4d04f49f6742db1d2665ddf6c32913c367f0b93a57f86ba13b9883a42a528aff44c48196941d7c0fd7a27005db6adaf07802e501 WHIRLPOOL 279ef11d2d6f0cb7c192189d64bc6971cdada7417b93a65a3ff0ba4548b736b53b9812803024c2349114e94e0864f2b58c23812687ed3f75cf28334b0f6e11ac
DIST nss-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd.tar.bz2 28849 SHA256 0388cb01d6158fad92b6ee13241531c7dba66a4be64e85160ded212c3febadc4 SHA512 6994bd7435ad0cff9f5aed509c5f7ea438a6829188bea94d57020e8df6d75631b289363b6f68c3c96da67c958af967c624147d3604b734d8f0b57688f74e7c95 WHIRLPOOL a168e137981f4bc4cc6735bcc234b3fe14ea0cc91768926cdaae3f124ba1dfcd06be029c3805ded20df600c8655bb2d97beb69a0c6b7f2441e7ee4c651cd7868
EBUILD nss-3.15.4.ebuild 7497 SHA256 9e9f714c0dad52e14b147d272ceff71376d8b45725e7563b1af84afb49768209 SHA512 0b95499c659774c86ea9ad66ead30d942b8c656339b0cc4cb52aae12f6826b3996d33b9424b0a5e7bc54c08af776151dfb5f8e5ddcb4be934eb8245cb679b7dc WHIRLPOOL df8a3c6f7fd45f92e5430ec27ed2ff240e59113d52ea1125689f9eee9d75b7fbdbb50a41f3e65ad0cd6c459aea109764a5465a0aa5612ca3be08bd6ddf1b1c65
-EBUILD nss-3.16.3.ebuild 9209 SHA256 96458cd5533b167c2e33f51772710e63e33f22e9f8e049219d7403bcd0bccb03 SHA512 3451e08e0ab19b2081d19ae878c518782f8d0421c1f0f8e0e9c154ce6c2e72a74bedd61db4d0f489d5e9b3a0fa6c3c514b446099de8cf8933da5a74f7a27d4b0 WHIRLPOOL 0a8e627dcb579db0bb18a1eab8f592888327852805c6cb46c1572a4f1c11fcc50391c5fcb2b48bcb10ae255c06ff4fc2942169f358be5310f0cba3e50f94cd2e
EBUILD nss-3.16.5.ebuild 9281 SHA256 39c80aaeed8a1a38eba4ca6116499e3c58af1017a8c6a1b2dc01cc0b6dfa09cc SHA512 8699a62d9c5b720e6f57317dfbba2b10b2c0d660699f7c28da959a7a361b317d1e3fa5ca6129787cdd1ccf3cea70094bd35b0cb1479da0dcd63641295c51af8d WHIRLPOOL a2666b1c0f01f23ce742355102899d68c925ccf9032143e11e350443341412f47e465be3b3de79ab07d09dae4b42c5bfc4385850a81cf5519f43eee309c3cf65
EBUILD nss-3.16.6.ebuild 9178 SHA256 6880464c77f6d56ee14751047d46a5f05a8e70628a039aaa02a02616ab6f19ac SHA512 a6b2075518d8d4ea59979592ef2000bc3a39554b66afde0ef0bc311c6e97ef96f0b0c097dba5845953c0cacccb62265a4d1687f5a651e75cfae57e4a3dfe36b8 WHIRLPOOL eadc553a7209cf9b83bc987a263eef7e2d90165d9cff464fb09e71723f8a37ed9ccb5c3fa8033376460bd0f0c3658bef03d1544da45048494662b2fbbd9f9c8e
-EBUILD nss-3.16.ebuild 7732 SHA256 63f6fd9148ca01e1aa518c2470a2bb00672553f879601456c8ceff7881579db1 SHA512 a0300601a5d71bce6882dccc4527397d6ebcdee34bf1805d15c064b582e2dade90752b4cfba2818d61dd02ec36ae0e97bd441736ecb5dfdc71561e456e259cc2 WHIRLPOOL 1b9046fc91a69005d65a7624bf2bda682618d52ef69ec98a8e7f0641ac17b5356f8ba931a5e84ae6a85c0a2245649c0c30e75c6ef599db4c741adcad98e5d910
-EBUILD nss-3.17.1.ebuild 9180 SHA256 d07fd31181ca9814f3d72832ab9bde8b380840e68aee6c3a6fa108252ebcdd06 SHA512 5f56d625e4b7a0dc25706f3a7b3393abba2e8f1f891ec7729bdf89a680b2c6496c1add02085ea9603cfd723261002512f887f696e452d21f83ffa4757dbad8a7 WHIRLPOOL 77898a6953d7cf5f32055f6afac1227da8c0b6da0515aea4d85fefe3acdb47b1f14e90ea88abdc159089642c76d22e316b96e78976ae74ffbec37c20390568e5
EBUILD nss-3.17.2.ebuild 9180 SHA256 f91cec2f26843dc1de4c1bb2a05277a1c6f3ea8736ddc6dea0bff2ca40dbbf78 SHA512 25f369bf8046358c04f9d9d1d74f1f10b428d13701e418d99a512a4a9c7020749cfff2237de3350417e5ec809c2924486ff3b50ae9e3176a89f96a652dbab74f WHIRLPOOL 40bd7b01f9f7eece17befeae0d767361c9d38f8c5ab846375359b399146dc2849b57ab9e011c848ac2ffdd0c4c2bcfa1864e2aca34453be0518db0ac36e03ad1
-MISC ChangeLog 50450 SHA256 67b476487699199088ebbdb139c8c491fd22ff552e1930da86c3f97af9f6f45f SHA512 cb56583248ef29115417bb5faa7bc62f7f426d33d333d94eae3a7e093ab5ff690aca3ad648e6da16c82db54dd768e5e2560a6191e41c756713f678f73c00c953 WHIRLPOOL 817fb0ad12c5d5e680d4fca9b443ab4b4205476ca8ba8170d7f305fe958b139e53f6c70dc0a999c72c852514ed45d26948add191b7dc9b2dcfd9ce749cba3a41
+EBUILD nss-3.17.3.ebuild 9189 SHA256 cc7ee0ac50c1b482a620045a124f55bda753ebcdba99958ef868746fc14d785b SHA512 667324231c9e3c086c432dbf84af08b9fe21f77987c673ecdc29e5209a9e5a2c11cde44c828c134c8872534f70851da5123843bd3b27364f8f80eee50e884ddf WHIRLPOOL f9fc259d1826064be9ea1949bd68faad9d60b56d48bc198fd28fbfb212e0011ffb88913fc85b462e5009503f01f1a8f892f516796f83d728fc0d102283ac0df3
+MISC ChangeLog 50673 SHA256 0b29964f4bc8b2f535db46275100d7f07dfb58cca77765078a63e015f4a531bd SHA512 38d9e546114919b78f7f295a8bcd8bb37584d7be5198d92960b4b361eb797543cb802ad7451157f2d0862e32be7d1d16c3ea53d4bd6fa8ea8be0db41656072a0 WHIRLPOOL 6ce2a1b696005b72222d151d71886e6f87f183bd706fdf08b854e6878c2d6de5dad8ec0c4ad0f9ca8b724502a6e679f6911e6e81a71cd2f8539e39990a47840b
MISC metadata.xml 545 SHA256 d3a7dfb4b9f063b343b42b3002d3722ee44aea8a47154fa2158533aa94a5a258 SHA512 4da88948d5b637093646300bab0105c642968b2c9693939be6b75b5d24f02bd9b2cc5f13ae18594b9b00fa8dfe02e5d6959c13021124cd027007649787aec750 WHIRLPOOL 0879625ef92b2db563e5a1b434176bab08846e815fbf0c963a23b3ca228b3525dc80f6e7940a303fc1dd47403416c67811ed09d00f29a431abc4979865b67ff9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlRZMHkACgkQkKaRLQcq0GJQYACfW90GPduYBGp/3bF4mvHuz2wH
-VucAoI72kGTDOnsHOfuP7M4ODYz9S/dl
-=FkR4
+iQIcBAEBCAAGBQJUgAPrAAoJEPiazRVxLXTFuKYQAL4jSLlzLpQ3PZXMFVYKxUk9
+sLLltf2X/20H7lQG+K2MT1dI2Q/x+Ws5b5wOMTIFP89ZuqDs1IcXp+kvz5gOU2EM
+Vs/2scNE8Qv2xsW0TW+XbH89ZCDdQ7JJ2XoPOejbFKu4c8OH+qlVspQguUOYn0fU
+aLDEth5dToSKNN4AFPWo0uWiSZZ6inuxo+o12g33m1AwSDuHGj1Wx/BN+YgpEZSp
+v6SgfQJVWnAzq494O2z+mjvOyL8DUTA58NE0UvFpMo13roMjcG04vu7hqDF6wzbX
+CchaOV4pRoJpbXiOLL3iCP26PTL621oLsl0QacJ9VAG8rCGpyEeUK3Ez2IsDL7Zz
+NR7s1MDfKsaXC7QDC0qJpbgrd1QFAyih2iXBPXwDr7HJCE1qREbJ+4NfatKH+dl2
+IucFci4k7k+fFijT8Dkgl/0rWHSCyaGXZzTNkraYN6n+UQje1efsF0dJYOyMevsb
+yqhDgKvhoTtd11dIrZsWQ1iFUKSlJE4RMBWyyB5iv+9TzsAxyG7mi2ckwnNYS+d3
+UVA6BpJVN2Z90Us8dGonsJl8IyHyRbQXrz89WgfiVXcnN124P0t3c6QOAEtxM4z5
+ZWY26+WjqKFRNQNz1yeNQCsO7wXJjOKxIYd/dx9KwsMsuRW716dF7qGRKAd5UMXh
+m4y8D3CyUB1XJaiUAm5D
+=081o
-----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.16.3.ebuild b/dev-libs/nss/nss-3.16.3.ebuild
deleted file mode 100644
index c6dbf2c83eec..000000000000
--- a/dev-libs/nss/nss-3.16.3.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.3.ebuild,v 1.6 2014/08/10 18:37:32 ago Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.10.6-r1"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="3ade37c5c4ca5a6094e3f4b2e4591405db1867dd"
-PEM_P="${PN}-pem-${PEM_GIT_REV}"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
- cacert? ( http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
- nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cacert +nss-pem utils"
-
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nss-config
-)
-
-src_unpack() {
- unpack ${A}
- if use nss-pem ; then
- mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
- fi
-}
-
-src_prepare() {
- # Custom changes for gentoo
- epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
- epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
- use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
- use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
- epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
-
- pushd coreconf >/dev/null || die
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
- popd >/dev/null || die
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- config/Makefile || die
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- cmd/shlibsign/sign.sh || die
- fi
-
- # dirty hack
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk || die
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk || die
-
- multilib_copy_sources
-
- strip-flags
-}
-
-multilib_src_configure() {
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- aarch64*)echo "aarch64";;
- hppa*) echo "parisc";;
- i?86*) echo "i686";;
- x86_64*) echo "x86_64";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- if [[ ${1} == BUILD_ ]]; then
- cc=$(tc-getBUILD_CC)
- else
- cc=$(tc-getCC)
- fi
- echo > "${T}"/test.c || die
- ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
- case $(file "${T}/${1}test.o") in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-multilib_src_compile() {
- # use ABI to determine bit'ness, or fallback if unset
- local buildbits mybits
- case "${ABI}" in
- n32) mybits="USE_N32=1";;
- x32) mybits="USE_X32=1";;
- s390x|*64) mybits="USE_64=1";;
- default) mybits=$(nssbits);;
- esac
- # bitness of host may differ from target
- if tc-is-cross-compiler; then
- buildbits=$(nssbits BUILD_)
- fi
-
- local makeargs=(
- CC="$(tc-getCC)"
- AR="$(tc-getAR) rc \$@"
- RANLIB="$(tc-getRANLIB)"
- OPTIMIZER=
- ${mybits}
- )
-
- # Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
- local myLDFLAGS="${LDFLAGS} $($(tc-getPKG_CONFIG) nspr --libs-only-L)"
- unset NSPR_INCLUDE_DIR
-
- # Do not let `uname` be used.
- if use kernel_linux ; then
- makeargs+=(
- OS_TARGET=Linux
- OS_RELEASE=2.6
- OS_TEST="$(nssarch)"
- )
- fi
-
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSDISTMODE=copy
- export NSS_ENABLE_ECC=1
- export FREEBL_NO_DEPEND=1
- export ASFLAGS=""
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- NSPR_LIB_DIR="${T}/fake-dir" \
- emake -j1 -C coreconf \
- CC="$(tc-getBUILD_CC)" \
- ${buildbits:-${mybits}}
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- CPPFLAGS="${myCPPFLAGS}" \
- LDFLAGS="${myLDFLAGS}" \
- XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
- NSPR_LIB_DIR="${T}/${ABI}-fake-dir" \
- emake -j1 "${makeargs[@]}" -C ${d}
- done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-# */${local_libdir}/libfreebl3.so*
-# */${local_libdir}/libnssdbm3.so*
-# */${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
- local shlibsign="$1"
- local libdir="$2"
- einfo "Resigning core NSS libraries for FIPS validation"
- shift 2
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libname=lib${i}.so
- local chkname=lib${i}.chk
- "${shlibsign}" \
- -i "${libdir}"/${libname} \
- -o "${libdir}"/${chkname}.tmp \
- && mv -f \
- "${libdir}"/${chkname}.tmp \
- "${libdir}"/${chkname} \
- || die "Failed to sign ${libname}"
- done
-}
-
-cleanup_chk() {
- local libdir="$1"
- shift 1
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libfname="${libdir}/lib${i}.so"
- # If the major version has changed, then we have old chk files.
- [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
- && rm -f "${libfname}.chk"
- done
-}
-
-multilib_src_install() {
- pushd dist >/dev/null || die
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
- cp -L -t "${ED}"/usr/$(get_libdir) */lib/{libcrmf,libfreebl}.a || die "copying libs failed"
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED}"/usr/bin || die
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
- # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
- # bug 517266
- sed -e 's#Libs:#Libs: -lfreebl#' \
- -e 's#Cflags:#Cflags: -I${includedir}/private#' \
- */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
- || die "could not create nss-softokn.pc"
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.h
- insinto /usr/include/nss/private
- doins private/nss/{blapi,alghmac}.h
-
- popd >/dev/null || die
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils="shlibsign"
-
- if multilib_is_native_abi ; then
- if use utils; then
- # The tests we do not need to install.
- #nssutils_test="bltest crmftest dbtest dertimetest
- #fipstest remtest sdrtest"
- nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
- cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
- nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
- pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
- symkeyutil tstclnt vfychain vfyserv"
- fi
- pushd dist/*/bin >/dev/null || die
- for f in ${nssutils}; do
- dobin ${f}
- done
- popd >/dev/null || die
- fi
-
- # Prelink breaks the CHK files. We don't have any reliable way to run
- # shlibsign after prelink.
- local l libs=() liblist
- for l in ${NSS_CHK_SIGN_LIBS} ; do
- libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
- done
- liblist=$(printf '%s:' "${libs[@]}")
- echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
- doenvd "${T}/90nss-${ABI}"
-}
-
-pkg_postinst() {
- multilib_pkg_postinst() {
- # We must re-sign the libraries AFTER they are stripped.
- local shlibsign="${EROOT}/usr/bin/shlibsign"
- # See if we can execute it (cross-compiling & such). #436216
- "${shlibsign}" -h >&/dev/null
- if [[ $? -gt 1 ]] ; then
- shlibsign="shlibsign"
- fi
- generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- multilib_pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.16.ebuild b/dev-libs/nss/nss-3.16.ebuild
deleted file mode 100644
index 8f3fd094b6c0..000000000000
--- a/dev-libs/nss/nss-3.16.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.13 2014/07/24 10:58:18 polynomial-c Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.10"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="3ade37c5c4ca5a6094e3f4b2e4591405db1867dd"
-PEM_P="${PN}-pem-${PEM_GIT_REV}"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
- cacert? ( http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
- nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cacert +nss-pem utils"
-
-DEPEND="virtual/pkgconfig
- >=dev-libs/nspr-${NSPR_VER}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}
- >=dev-db/sqlite-3.5
- sys-libs/zlib"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_setup() {
- export LC_ALL="C"
-}
-
-src_unpack() {
- unpack ${A}
- if use nss-pem ; then
- mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
- fi
-}
-
-src_prepare() {
- # Custom changes for gentoo
- epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
- epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
- use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
- use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
- epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
- cd coreconf
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" "${S}"/config/Makefile
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- "${S}"/config/Makefile
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- "${S}"/cmd/shlibsign/sign.sh
- fi
-
- # dirty hack
- cd "${S}"
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- aarch64*)echo "aarch64";;
- hppa*) echo "parisc";;
- i?86*) echo "i686";;
- x86_64*) echo "x86_64";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- echo > "${T}"/test.c || die
- ${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-src_compile() {
- strip-flags
-
- tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
- local makeargs=(
- CC="${CC}"
- AR="${AR} rc \$@"
- RANLIB="${RANLIB}"
- OPTIMIZER=
- $(nssbits)
- )
-
- # Take care of nspr settings #436216
- append-cppflags $(${PKG_CONFIG} nspr --cflags)
- append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
- unset NSPR_INCLUDE_DIR
- export NSPR_LIB_DIR=${T}/fake-dir
-
- # Do not let `uname` be used.
- if use kernel_linux ; then
- makeargs+=(
- OS_TARGET=Linux
- OS_RELEASE=2.6
- OS_TEST="$(nssarch)"
- )
- fi
-
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSDISTMODE=copy
- export NSS_ENABLE_ECC=1
- export XCFLAGS="${CFLAGS} ${CPPFLAGS}"
- export FREEBL_NO_DEPEND=1
- export ASFLAGS=""
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- emake -j1 -C coreconf \
- CC="${BUILD_CC}" \
- $(nssbits BUILD_)
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- emake -j1 "${makeargs[@]}" -C ${d}
- done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-# */${local_libdir}/libfreebl3.so*
-# */${local_libdir}/libnssdbm3.so*
-# */${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
- local shlibsign="$1"
- local libdir="$2"
- einfo "Resigning core NSS libraries for FIPS validation"
- shift 2
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libname=lib${i}.so
- local chkname=lib${i}.chk
- "${shlibsign}" \
- -i "${libdir}"/${libname} \
- -o "${libdir}"/${chkname}.tmp \
- && mv -f \
- "${libdir}"/${chkname}.tmp \
- "${libdir}"/${chkname} \
- || die "Failed to sign ${libname}"
- done
-}
-
-cleanup_chk() {
- local libdir="$1"
- shift 1
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libfname="${libdir}/lib${i}.so"
- # If the major version has changed, then we have old chk files.
- [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
- && rm -f "${libfname}.chk"
- done
-}
-
-src_install() {
- cd "${S}"/dist
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
- # We generate these after stripping the libraries, else they don't match.
- #cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
- cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED}"/usr/bin
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.h
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils="shlibsign"
- if use utils; then
- # The tests we do not need to install.
- #nssutils_test="bltest crmftest dbtest dertimetest
- #fipstest remtest sdrtest"
- nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
- cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
- nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
- pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
- symkeyutil tstclnt vfychain vfyserv"
- fi
- cd "${S}"/dist/*/bin/
- for f in ${nssutils}; do
- dobin ${f}
- done
-
- # Prelink breaks the CHK files. We don't have any reliable way to run
- # shlibsign after prelink.
- local l libs=() liblist
- for l in ${NSS_CHK_SIGN_LIBS} ; do
- libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
- done
- liblist=$(printf '%s:' "${libs[@]}")
- echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss"
- doenvd "${T}/90nss"
-}
-
-pkg_postinst() {
- # We must re-sign the libraries AFTER they are stripped.
- local shlibsign="${EROOT}/usr/bin/shlibsign"
- # See if we can execute it (cross-compiling & such). #436216
- "${shlibsign}" -h >&/dev/null
- if [[ $? -gt 1 ]] ; then
- shlibsign="shlibsign"
- fi
- generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-}
-
-pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
-}
diff --git a/dev-libs/nss/nss-3.17.1.ebuild b/dev-libs/nss/nss-3.17.3.ebuild
index e9fb8334771e..6c56abe9110f 100644
--- a/dev-libs/nss/nss-3.17.1.ebuild
+++ b/dev-libs/nss/nss-3.17.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.17.1.ebuild,v 1.2 2014/10/14 21:10:22 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.17.3.ebuild,v 1.1 2014/12/04 06:49:14 polynomial-c Exp $
EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal