diff options
107 files changed, 1520 insertions, 1087 deletions
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD index af9c01dbb3..f7a5ded677 100644 --- a/main/alpine-base/APKBUILD +++ b/main/alpine-base/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-base -pkgver=2.6.0_alpha4_git20130308 +pkgver=2.6.0_alpha5_git20130313 pkgrel=0 pkgdesc="Meta package for minimal alpine base" url="http://alpinelinux.org" diff --git a/main/aria2/APKBUILD b/main/aria2/APKBUILD index 9df2ecb9a3..9c81a3152c 100644 --- a/main/aria2/APKBUILD +++ b/main/aria2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=aria2 -pkgver=1.16.3 +pkgver=1.16.4 pkgrel=0 pkgdesc="Download utility for HTTP(S), FTP, Bittorrent, and Metalink" url="http://aria2.sourceforge.net" @@ -39,4 +39,6 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="9429ce88b942542da40c2e8c74442b85 aria2-1.16.3.tar.xz" +md5sums="47f44db9c6bc79a4fe65f0a4ed36791f aria2-1.16.4.tar.xz" +sha256sums="a2c14395ad3c8959e7faea90480e00d8496da01b7befe7b484fddf1f9f614048 aria2-1.16.4.tar.xz" +sha512sums="759364adf9459902a829ac9943dacaec6a25403a9689e3bf20c41cf21619fab4ab3f9df76893edf0e5e8f71572beea576fb68a0c7dca352baea7e9c2c8750c5f aria2-1.16.4.tar.xz" diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD index fd4f1203bd..3536fbae88 100644 --- a/main/augeas/APKBUILD +++ b/main/augeas/APKBUILD @@ -2,17 +2,16 @@ pkgname=augeas pkgver=1.0.0 pkgrel=1 -pkgdesc="a configuration editing tool" +pkgdesc="A configuration editing tool" url="http://augeas.net" arch="all" -license="LGPL" -depends= +license="LGPL2+" +depends="" depends_dev="libxml2-dev" makedepends="$depends_dev readline-dev" -install= +install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-tests $pkgname-libs" -source="http://download.augeas.net/augeas-$pkgver.tar.gz - " +source="http://download.augeas.net/augeas-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -35,6 +34,7 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info make || return 1 + make tests || return 1 } package() { @@ -45,6 +45,7 @@ package() { tests() { pkgdesc="Tests for Augeas lenses" + arch="noarch" mkdir -p "$subpkgdir"/usr/share/augeas/lenses/dist/ mv "$pkgdir"/usr/share/augeas/lenses/dist/tests \ "$subpkgdir"/usr/share/augeas/lenses/dist/ diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD index a2b2bacbbc..525c55941c 100644 --- a/main/bash/APKBUILD +++ b/main/bash/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bash -pkgver=4.2.042 +pkgver=4.2.045 _patchlevel=${pkgver##*.} _myver=${pkgver%.*} _patchbase=${_myver%.*}${_myver#*.} @@ -109,4 +109,101 @@ c10692f447d4966c879f8fb8d7c8ebc9 bash42-037 cd48f57a404498d4e5c73a3501c4b1a5 bash42-039 00a2371b6c05acbfce6bc850c6d982f8 bash42-040 7bc4942a66ca4024ee964db7ede07896 bash42-041 -1cf7701017ebfc8e129de92c8f8b798c bash42-042" +1cf7701017ebfc8e129de92c8f8b798c bash42-042 +9e61168fca692d8d1a733c389a63712e bash42-043 +b4b11d64b45ea9ec50dcc74c6c3861f6 bash42-044 +1661bcc83c4715f54368877452ff2247 bash42-045" +sha256sums="a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 bash-4.2.tar.gz +363bc919d98cadbfca27660be0d1d4bb6cfe1c5f86a7830966e456df36e46792 bash-noinfo.patch +8d6ca028576c4af23e660a2fbc2112221a11c8a785c0b37f033967e5cd12b47a bash42-001 +febac927e199aceeba2004908d971d4afb49b521796c3f42d1166f9fbbfbcef9 bash42-002 +5a0a7c15018c87348ea87cb0beea14345faf878dbb0e25c17fa70677194cb4cd bash42-003 +4e34b0f830d2583d56e14225a66937abc81f45bbafcd2eb49daf61c9462140c1 bash42-004 +a81749e73004b81cfdf0fe075bec365dc1fef756ee5e3fd142821e317d1459a0 bash42-005 +c91148945a2ddafa792682d7c8668c59e7e645eae1334b15b0d5d9ad22634bd1 bash42-006 +405826acf443dd1084f236a15cb76d7f0ee2dbe5edff45c5fb836db571fb7e95 bash42-007 +23080d11a60a78941210e2477f6bca066b45db03defa60da86fd765107ba2437 bash42-008 +e7ed5440b4c19765786e90e4f1ded43195d38b3e4d1c4b39fcc23de9a74ccb20 bash42-009 +acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc bash42-010 +a491ae359a7ebbd7321aede561728289d71e1fc84777f402766a8afd4d261532 bash42-011 +354433f1d2da02f1b9652cd20a5b85bbfb5bc2aaf79c42461ebd929d89b9b7b8 bash42-012 +3412c5c6cbbce6c88592604aec054d8182ce64410038b5ecea69fc3968cf85ea bash42-013 +b5a678e609858532735f94faedb5fabce00dfd6577a4e9ec5eec85fe682c8b33 bash42-014 +2d876a8304bdf3d664e87e0a8d73bc4ccc100a9dd8c0d054e8649472d8748a98 bash42-015 +2895ccbcf7fc98da73a8fa3ba7440aaf2bfaef6c0af8bdd3a9c39403cf03e2a6 bash42-016 +73552444498c761d6073dd67ccfe043b36ef24bb418c266d91d9750884daee7f bash42-017 +e2a9457172370d454d31b84bbcba758ee6394316dbe755374553b52aadbb494d bash42-018 +a8b7cd02207656976016d93cab48e073cb5da002ceb27b7a63fc5ea62007eb56 bash42-019 +494773f0d0078cb35372d24caa523b00d8fdbbaed71e41dc14c9e47579da3c6f bash42-020 +a887a97be226575ecf483be2c76655bd6d1edde1cdfe199c27bd2e6baf32badc bash42-021 +9dcdf69df7f8cd2ba88d18c45a0d8f55fbe4f0e273411179db94dd6198b85c6b bash42-022 +5dc11394f1a6c887373c081396efd4f4cc04492696722c57a4811c207965f0bf bash42-023 +99c826bdd33bee281d0a9191550d62a24d0b256cd41c90afd10abd63a66b99e6 bash42-024 +0db0646fd7a559d5702911192bdd387acbbc61cf3c29a34007c3ec840e275515 bash42-025 +e7e90cfaabbce3b4b9c699994e9d9ea4a2f084fd9f37788a80b0b70b47d323d2 bash42-026 +0c1f6b7256fcc17f42c05f9bbb4138f8e8bb67e79c622c3485711b6f37f7ed42 bash42-027 +204226de39ba81aaf3dd5a29cd59de052ec9f648538bb9e7f1c8150852b1ed7a bash42-028 +d0b08c0817bc5acdb28b466727622a8422ca4d61188313cf162443b7f338f581 bash42-029 +12594366591a136d8ccdcb8e218010f2ddab6be28a7f96d0ed32ca927e44afae bash42-030 +55f38c4d34775fbb063510c4222b195d998dd86f88288b64a6103e3812f8d9f9 bash42-031 +e3a8b563dbb1e5cb7ca85a53515da8b2941213973496d48c4cc5a11c604791ed bash42-032 +f5d12790d69fdfb2f47ac86fa1ea1ecc088880141570273f38dfd3fa4a46434b bash42-033 +01c1f332101389cedf347c7736102966722a3b213900954e5d625bbc2f1e41b8 bash42-034 +cecde463b038b4849635ff0993d9b264fc92403e7ae0accb52c7877aeaed78df bash42-035 +fe293a1bc92ac4d272ae9b9a0de3afef7c06145a2b52337a09cacccc5305aafa bash42-036 +c7578cddd3bb2430689c740f58a03403800726dcd1268b28f91bf37f368e1674 bash42-037 +b8c9a81bdf206be58ba491dfad80373b3348af769e80aaf72f7611ddbbbe6d57 bash42-038 +f4f9300a60321a5088ae9e54052a64c4d3e876f9a3a17ca104d58fa38b9c1791 bash42-039 +b265f9caf3c7321f95bc8e0b9e2c46bd86c226f00f05e823699aafb83c4aaa6c bash42-040 +05cc1951bd9f6624088dd6067486ff47f1825e333273d7df5f1b06b23baaf5eb bash42-041 +faaa5c1f456517b258b2a65eaa664dd6a01eeff73c8ca4447c3a6de371bbf304 bash42-042 +dc2683840f3e890a9c5f85338366ff6cd923285e558eb46aa818a03fa67c5c57 bash42-043 +10d32d6c9ccdedb1d826f46468631d475f9dcf983fac087766e16df7b99766e6 bash42-044 +ddb7eff0f59d394a483b09feec3771d9026f81ba90afac32846a19b172b2986d bash42-045" +sha512sums="fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c bash-4.2.tar.gz +74d51550cc03410f22ffea13f6452350d1e5564bff619fb07a5bbef14ca565fbe03770a2c0041292732cda16e8944b33ccbd0dfe29a606a068fedabe277cd6ae bash-noinfo.patch +931f2f1d4e677925b5057558ea6f157073a9ba87bf4ed59e7d8fe20957c5fc40f3384a98fc4a2d5d7b458129ec096d9e28a860b6844ebf15f377778a6ef8aade bash42-001 +b9ca62e397a05b368b74920d8d1b168367ffe840cf168e312b530c5b390cef3ca53e31db63c9fe15fe1a36e4c98369bf10573db40d20712fb1a016f10e0fc893 bash42-002 +6cf944ab0f554ab53831cbe114f771671c7a9420778d2caa524c09a24ec8064e7a7ef1355e66ed3a53100b72736284a5b44e2c6bda03a8234a2f2d340ed47ce4 bash42-003 +aef5e753e59a82df07e18269064ff1d075e3b7558ac5aff7465da997370496bd4ef9c25920d7a47f66110d2ab719742033d96646921782d9ae15a27541765067 bash42-004 +ef7fbc3fcc8174e7dfb27fb5e977d3a52b1b4b989cd7f748b1b35ea0e581a59668f41ec030e80f2afdc8b43dfcf472fad2985da284632b9228a6fd30ba4d0556 bash42-005 +018031cc0cb2078937c81bd42459b98cfe793ff7d638ed2bd2859ec1c73da6a420d649f7dd49f2367035fd08af430ba783c68417088b1e4126095ab9467c55c9 bash42-006 +65cef48b77530a3b87dec1c8c3fb28f553e83f28f24d5e170022b4962472e3e0021a57051800e1ddeebdb78548a3c192c4e1fef0f6e82612321c5d1335e2f8f8 bash42-007 +5a782a165701967dc3c34d7723d13668b9ca0c4679de0f6150f42a183425e110281d893f30fa81eae27821a6d89e8ce9d9631268d9e02bca57cb8fece0389f3d bash42-008 +ad0b58d00f37e8626a0bb664df7e24e0f19dc637aa829ae8f92fbe02a53140a3ca7de00f620c5b53001223a002ec774e5088354b342a640666810fd57cd1ff9a bash42-009 +66e84164be08be47b0d7c8286b7d94a4da8538316dce8f8be54702fed2a44798d5f717ae3f524ce735d071430195ce10052a264f3f458b950fe26381fe6506d0 bash42-010 +0664fe80f3da9e5e64f1f0fc227e3937db6999526f743e74cf8d6eb589add10449c505422e241f1dfa0cd1e02c03c029cc0b7459850a52cc17d9c3a8d9c26a71 bash42-011 +0da4822a29d26d713aa5bfae00911db2db37242ec962edc4f256c8740e345b68e23dcaa4ca8bf37eaaa9e58facde6fe87c3b20c5bad565725a178555aed49503 bash42-012 +25f4caed2f4eb3f65dfb052b4b9b30a02fff8a1e6d6575e2da6bc1ce02d10aeb113870916f0b74ea2cd0722f81bcf8c05f70be1af178cff3c7091151d5791de5 bash42-013 +ea8dbe73d40bdc0bfc1752ad6fea9503b72bf4c204a6b0d04ee898429f2b16bf9fd21f8ce25b72e87efb82769a228ace31f1624f03491383129ce7935ead97aa bash42-014 +dd572539a26ae5c80b1c39cce8c548b9de0ab5b5f7e711974413322cb20845690f15d985713facab71957b6988553c0a613d5fa3dee2d263bdd9a8d7a5599ea9 bash42-015 +2203fd108df4e9c8c93974ce2ac10d8d7bc9b6df1db92ff88b3b394d6fa26ca13de6e308480c192907ecd658df5b4bd3b077a946127b82167c3cac431c3defa3 bash42-016 +e2b93fb5f904a0064addd2d2d20bf4f8d868120bad1486916ae0774e41ef4123cbf5b31ef64109361d091ff317cbadbd28882d6571d3014052229a14993ed933 bash42-017 +facbe3d258e0e7514bfe3a8c6516aaf2e405facd233e205794ffab815f850ba7385d2d18d7b3a9c000cfe254a771779c6d8829b2fee66a9d6071b1888155b5a1 bash42-018 +f8086b8358201c10e96d9533b90a58248e26bc379be96a8a9fba88e09c227acf85cddb26c04e93043b35371c12cbf156f591c9af88b1eb61ba8acca53f6d07a1 bash42-019 +23549c7a56e43f9aff7ebc376657ff498d07b47ebbfe6707ba3711e095fd80ca86d077c5379ee62c86711880979debd7b60733d83e12f349ced9e93860d8fc8c bash42-020 +09783ce72651af6abffebdfb3d3e7446b29ac4bfd395aeec66ef1f5c8a2bdc2238957b7e6f4e896178a5e4e24987de209e6776f29330879c0d8e14e8495d8284 bash42-021 +ab6f3f175581f34dc106176fbbf5c2d19e9f421e16f328cffe98f11ee01462b63e0f1e720ec467780d91eb240a4a7fd4fd1cfdf6e0cb1293a8e42e8a4805c152 bash42-022 +b9d7044800a988dac8c59c48bd4845d3197d6ba965d22fb8f62b51b9d48f5a55519104a16283fb638264a6f858a6d574f8547d75721b96da640721bbdf097d81 bash42-023 +b4964ff258905cef806add58eadda17501e98bb3b3b5c8ce8ee0a9250e5bdf0a01329e1bfa973204b1c8e5da8fd068bcef624ec65c2f401c41d0b6b55cb2ba76 bash42-024 +b4b80ef1a7599506454a912e2ee23f422bd199a675199b926c3770ba9091fb69583ddde84e67d897c79e6a047ebecbd18a5ee72557e7526c4108476eb5cff71b bash42-025 +b00200d0b9040c74117e0150c589abb9e511abb01888c485eac770ab61c234669aeae3957a6752ab99c378ffd8188154bbec713c608b92cd3185a649b71615bf bash42-026 +107e13482deb9f6355196b2be9b717090aaffd8cf1580ab347bf38600e607c31cef5173b68e426a45d1678c7c64e7e095d5b6da941a5f53218919a0629e2fcfe bash42-027 +6e6ad04e7cff2d65045a9afb617c041b571b6c8cc728f9994825545b7d43c0c7868c68b22546784a6f604d3e0ec22b7bf0423e9d49b7109fefdc5d3db4b31399 bash42-028 +9349625892201cb46f3669c18a38c86d609c1c9521fb8caecd6880df822897c6d2541dc0cf5d3d11d27779a3be636b0c6550b7e3b010d37e83804fd1ab27d35c bash42-029 +4643252a45b7fe84451c0bea95bd0089a1685067032c8a2e42bc78587deef5b6095de77500d1c54227f92940b201d193984852f65ef886237dd435617639a46a bash42-030 +de0ea5c279ac956aca48f12e2962dcd4ae2f653349bf2350ae7b53e8370aaf882109fcb29bf559cd81512362bf31a100193de6bf193ff52331e8325df2f82e91 bash42-031 +ed35285989290c10f5013770397aa14897e63a28f5ae5a61319ea5881b0abd84410686288cf0f14dd9486d8fd623c410f857b48fbdb62350121e3596527dd3bf bash42-032 +89e277e5a2f43fe75678c0dab57cd7c8761efa38f5902ed0b311ef6a0cdf48f683d3f28fd419908db43afdaf4f81d831f0fd630795f4d20b317543cb9ab95970 bash42-033 +d59a4a67a241d262de5fb27b96af0f15b0f6e7e922b2d61ea86e037dcd07ea77ec3c1ef6b289e5bbccd011b632538f264bb6426c3a07dba1946c094be56e0b16 bash42-034 +9f294177e91600f65cfee1b9dbf59b3ad7db449a99cc1013b7c97ef6c814b51afa7a2d2516a37fcc110ff3f0b25c4b06e42094f4665e03e41650bfa69c15eaf7 bash42-035 +7e114b99d8f5b210b826715c77adfdbb115e86ace35f7ff331fc6f595a4d0f689a055ccf7adfbafc057c7549f5597e4de455ab9e18a6ffeb5b4fd1d3a2aab99c bash42-036 +4466990dc3499ccde5940ddfb383052fa345d4e53fff7c8963ac7482fa280658b4516a1583486175cab2f3a5c8afbbedda8461e3cb1802031bce8db386404608 bash42-037 +f835bb393153310fa2e4c2d95a98c0db53a97075f8989d61cccb095db223495777e413b21e9b235391a4a0f34d935a828ff5ccf337520d5dc87d380170efb351 bash42-038 +4c5e44a623840c7efe7894f313a5691307b12aea325dbc923b48deb6ee6ac0bb2ff7afb0d2ee12ab97b04d60c1b9e2a4facc51b66c93be9fe0beda317ec7318f bash42-039 +ff5cfdd2aa846f0831a1f2f7b477e70fc6b68b6c4f4785293c417039a7f3fd4822ade4658ea17046ab9616c3fed02b463e6a3e60aeb7daf6ab667da14b9a482e bash42-040 +7c9c12fc77bb764dbe8061e6df9419ab84d296a76c4a8bd96cf0f507bf70652a1c869162ac8d8c36f2d16ea0912a142fe14d6db45636bcb6e6fdf1444f0672a6 bash42-041 +99fd4f5f70e3d7d2e8dc1dac80e6ee6e0bb9ba1f629f41019b13f36aba2404aa4d786049bb0039e5fee138a01b813d295d4303c7c3d561a3cf565ffa19bb081e bash42-042 +70503181c392faf565ef0b23a2f6d1614836ffb9c04791cc4bfb31aff7786fd5efab4072034a4cfba0035595140cf7f9461b1565e4854ec34823cbd4f5ab419d bash42-043 +e94cf93c5760225d4ac16f9c73078c3ce9913ffe1e20ffed8fa31084a0efd3dd63762b5437221f6b570078667e3ec19d882169ffe0ba4c498e258e56f17d2511 bash42-044 +64f62b19c79eb2c581feda2b9f3c36196b3a794ee9996f6d72078fbb0b8c5878aa2d8ff3e2698cf9769e42083704dd9342bb108212d02aeb79875fad70895560 bash42-045" diff --git a/main/cgdb/APKBUILD b/main/cgdb/APKBUILD index d3981d964b..661e7a2fab 100644 --- a/main/cgdb/APKBUILD +++ b/main/cgdb/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cgdb -pkgver=0.6.6 +pkgver=0.6.7 pkgrel=0 pkgdesc="The Curses Debugger" arch="all" license=GPL url="http://cgdb.sourceforge.net/" depends="ncurses-dev readline-dev gdb" -source="http://downloads.sourceforge.net/project/cgdb/cgdb/cgdb-$pkgver/cgdb-$pkgver.tar.gz" +source="http://cgdb.me/files/cgdb-$pkgver.tar.gz" subpackages="$pkgname-doc" _builddir="$srcdir/$pkgname-$pkgver" @@ -33,6 +33,6 @@ package() { mv "$pkgdir"/usr/share/cgdb "$pkgdir"/usr/share/doc/ } -md5sums="394b542b495755ab8392b7e88dace744 cgdb-0.6.6.tar.gz" - - +md5sums="e2d9a973d2683faf8130a82703bf6a31 cgdb-0.6.7.tar.gz" +sha256sums="074ed31d1e827a04574add8c27d391447d75313e85ff938005d8ec939499fda9 cgdb-0.6.7.tar.gz" +sha512sums="0a9d1cc3fb00c3cdaeb060d20d3312dd738b617ff1b188db33a074e2790f9721ca58e924ecc9929b84832c3ca22a334d7a66294439341a9b6868eef1baafca3e cgdb-0.6.7.tar.gz" diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD index 69ab6f7eae..3749e49a53 100644 --- a/main/clamav/APKBUILD +++ b/main/clamav/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=clamav -pkgver=0.97.6 -pkgrel=1 +pkgver=0.97.7 +pkgrel=0 pkgusers="clamav" pkggroups="clamav" pkgdesc="An anti-virus toolkit for UNIX" @@ -174,7 +174,7 @@ daemon() { "$pkgdir"/etc/logrotate.d/clamd || return 1 } -md5sums="1dbdd803b37c0d9d222e4316049f46a2 clamav-0.97.6.tar.gz +md5sums="c6e6e333d8c9bd3785cbc6ec296c146f clamav-0.97.7.tar.gz b4523253843761d7a7e5fa765b3fb2b9 clamd.initd e8a03fad6ce603631e8fe71a24d387c6 clamd.confd 401fe30d9af2fea3151f938b26ff01c0 freshclam.initd @@ -182,3 +182,19 @@ e48466ddfb56f66c623b83e58777b778 freshclam.confd 0d08fd29656bd4b018ecf8ce9706ac55 clamav-0.95.1-nls.patch ae1e48ab56a0fff1acdde023c1f6f350 clamd.logrotate 226824214c021b2366f0be1289561d17 freshclam.logrotate" +sha256sums="8527754e7eb235317e37a50706d94d3fc9d880fd0bf6f3cb83757d64a720e9ff clamav-0.97.7.tar.gz +5f8847600cacc35de56ea61c7a8d0761e5a351ccfd507fd3e07160170269e055 clamd.initd +4d978313004f66d871564b873df27c5459d3cc504788b179e41edba0f04b74dc clamd.confd +f69a8741f0165a1edd7558ce6c3ea8411fc2bc6e433a1636c25c366a057134d0 freshclam.initd +75551ce7e04bbef4a889bc94a357b160d9da88f06eba32df594ba3cbb2c81ed1 freshclam.confd +4aa3ba46cdea229355f90e2c6533c0f3c91f52ce869f7bc6dcc870a29450e312 clamav-0.95.1-nls.patch +ec5e60f7efca02ed151f625e9a44404346991ed6608c6e2088db2436bbd03d49 clamd.logrotate +84006ac3d2e8dc2e13a01f5e313c20e4978cdc93d831c181e0075badcbf4ada0 freshclam.logrotate" +sha512sums="92120250afb882b7fb9f956f2095797f8e3c93076a229967123261c907d9b4436cda6cf2d18b2c61cec8b33afeacba9c2701ad3322aa3316163fe4f36f7a7bc7 clamav-0.97.7.tar.gz +5f64211605db7fc91785331d6bb768cf71fe7579e40c82624e3fd71e4738e41d48cd4e7984e2ddbcc932aa27d3d77fb121de40e2ecdb123b81f58f277b184df2 clamd.initd +59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd +e192f89d6591c0601f828da368a8a21eb7ed14c50757630896fbbb3582c2660ad562760b28979904f1a4a21eecc320f2e6f7f0c7b673f89c6d2af83d2d4b280c freshclam.initd +ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08 freshclam.confd +8363ba0e69918ce2cbfef3adf3406d3f73d29adacc1f1382f11c1ef3b55baba96ee581beb5f9eaafbfbad1e00ffb0e4af39cd09b597cdba1e3ab2db39a3c5a04 clamav-0.95.1-nls.patch +57e5b0c0dc6dc078e0102829e5d36882cff9ae5dd0637c31c7a23ef274dd0a4d967bc036f74c42b4690af511bc0a43fdb6d19b0c307506432577d82de7beff78 clamd.logrotate +f1cd8df6d47824009a6df130bd60bf5e9f9deaef87fbeaceec8fe71e6c8b2772b5dba017390a2190deee851723256f06e9aef2182b0a2881119f22ba68740554 freshclam.logrotate" diff --git a/main/crystalhd-git-grsec/APKBUILD b/main/crystalhd-git-grsec/APKBUILD index 83e2f9c82a..297556f2ec 100644 --- a/main/crystalhd-git-grsec/APKBUILD +++ b/main/crystalhd-git-grsec/APKBUILD @@ -6,7 +6,7 @@ _realname=crystalhd-git _name=$_realname-$_flavor _kpkg=linux-$_flavor -_kver=3.8.2 +_kver=3.8.3 _kpkgrel=0 _mypkgrel=0 diff --git a/main/cvechecker/APKBUILD b/main/cvechecker/APKBUILD index 61548efcfe..75021efe80 100644 --- a/main/cvechecker/APKBUILD +++ b/main/cvechecker/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="A local CVE checker tool" url="http://cvechecker.sourceforge.net/" arch="all" -license="GPL" +license="GPL3" depends="gawk wget libxslt" depends_dev="libconfig-dev sqlite-dev openssl-dev mysql-dev" [ "$ALPINE_LIBC" != "eglibc" ] && depends_dev="$depends_dev argp-standalone" @@ -33,12 +33,13 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --enable-sqlite3 \ - --enable-mysql + --enable-mysql \ + || return 1 make || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install || return 1 mkdir -p "$pkgdir"/var/cvechecker &>/dev/null chgrp -R cvechecker "$pkgdir"/var/cvechecker/* &>/dev/null chmod -R g+w "$pkgdir"/var/cvechecker &>/dev/null diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 3a6dec5e34..486191d643 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -3,7 +3,7 @@ _flavor=grsec _kpkg=linux-$_flavor -_kver=3.8.2 +_kver=3.8.3 _kpkgrel=0 _mypkgrel=0 diff --git a/main/dbus-glib/APKBUILD b/main/dbus-glib/APKBUILD index a96caae836..9942f6f872 100644 --- a/main/dbus-glib/APKBUILD +++ b/main/dbus-glib/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dbus-glib -pkgver=0.100 +pkgver=0.100.2 pkgrel=0 pkgdesc="GLib bindings for DBUS" url="http://www.freedesktop.org/wiki/Software/DBusBindings" @@ -28,4 +28,6 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="d33959a9c0c6a158f5ac6d640316e89e dbus-glib-0.100.tar.gz" +md5sums="ad0920c7e3aad669163bb59171cf138e dbus-glib-0.100.2.tar.gz" +sha256sums="a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5 dbus-glib-0.100.2.tar.gz" +sha512sums="f7bbbeac189a724b7f95dce42e8adaf533a1d1c038521990d0eb2cb41c3f088a93d432c257a75dcce31419a55020455084d983b9471ace385c497f659a39ef59 dbus-glib-0.100.2.tar.gz" diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 6b44b943c4..cde37f8048 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=1.1.2 -pkgrel=3 +pkgver=1.1.3 +pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" arch="all" @@ -9,12 +9,7 @@ license="GPL" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" makedepends="lame-dev libvorbis-dev faac-dev xvidcore-dev zlib-dev imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl libvpx-dev - libvpx-dev sdl-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev -<<<<<<< HEAD - vo-aacenc-dev" -======= - v4l-utils-dev" ->>>>>>> 38cbbfaeafb21f57533ff98a232ffd99bd81d415 + libvpx-dev sdl-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev" depends= source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 configure-dlvsym.patch" @@ -43,12 +38,6 @@ build() { --enable-libxvid \ --enable-libx264 \ --enable-libtheora \ -<<<<<<< HEAD - --enable-libvo-aacenc \ - --enable-version3 \ -======= - --enable-libv4l2 \ ->>>>>>> 38cbbfaeafb21f57533ff98a232ffd99bd81d415 --enable-nonfree \ --enable-postproc \ --enable-pic \ @@ -80,9 +69,15 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="7434c0b38be2ce9c4344d067cc0067f5 ffmpeg-1.1.2.tar.bz2 +md5sums="f66eee18559ba59da63b895164a189c3 ffmpeg-1.1.3.tar.bz2 2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" +<<<<<<< HEAD sha256sums="dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce ffmpeg-1.1.2.tar.bz2 0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch" sha512sums="b947d18c7ea7d371e772c97873b180c00b94025a8546eb4663e42f37fbf66d52b1ea8241219b6c4700bd8c12cfb6af12fb7d823f7632061c447e2d95e30f83aa ffmpeg-1.1.2.tar.bz2 +======= +sha256sums="a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 ffmpeg-1.1.3.tar.bz2 +0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch" +sha512sums="56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 ffmpeg-1.1.3.tar.bz2 +>>>>>>> 7e618390d4ba971927b8052fd4c5e22796e2ce4a 635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch" diff --git a/main/geany/APKBUILD b/main/geany/APKBUILD index 9fa6973efd..c736385659 100644 --- a/main/geany/APKBUILD +++ b/main/geany/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=geany -pkgver=1.22 +pkgver=1.23 pkgrel=0 pkgdesc="A fast and lightweight IDE" url="http://www.geany.org" @@ -35,7 +35,6 @@ source="http://download.$pkgname.org/$pkgname-$pkgver.tar.gz http://download.geany.org/contrib/tags/wordpress.php.tags http://download.geany.org/contrib/tags/xfce46.c.tags http://advamacs.com/pub/tcl.tcl.tags - link-gmodule.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -90,7 +89,7 @@ dev() { "$subpkgdir"/usr/share } -md5sums="1cb7f6cea8e301c416211786cec474fa geany-1.22.tar.gz +md5sums="1af9955785cd148a3c2350f014435142 geany-1.23.tar.gz a3f52be1523faacbd8496409051ed598 dbus-glib-0.76.c.tags 33bd4e563c52e1286324b81601a77995 drupal.php.tags 95221e92a942928569f23ef03c7f5dc8 ethos-1.0.c.tags @@ -112,5 +111,50 @@ faa05eceb4d806e0c9f7476e4644a65b v4l2.c.tags d046ab5c4e7ab2a6ba8961285edc4b2d webkit-1.0.c.tags 0e51399cc03d094d15b389a2f89dea51 wordpress.php.tags 8f873570cc244b9185ae26e560887490 xfce46.c.tags -4821553235a2b6752356229ba64631b6 tcl.tcl.tags -5e47a67fd3ce35a8b9a21890082cd6cd link-gmodule.patch" +4821553235a2b6752356229ba64631b6 tcl.tcl.tags" +sha256sums="f0590e42becb38e407811ef3e692292423f76cb5178a13b168cc01c860a5a176 geany-1.23.tar.gz +83d4936b4ec913292390bdf62ad432bd01ff969ca1ec9f08f98c7d03925c8c25 dbus-glib-0.76.c.tags +d4603ba815ede0ca93fbff8e195c8dcab1724c553081be6d5965572d99ee8912 drupal.php.tags +7cdb704a199f413e96850d621721b196a49aebb6d1a3bd849152d590de0e3153 ethos-1.0.c.tags +49d69b35f91e3d28ed9e7e4654fd1d956ad574c304d788869d03c70b2393d644 geany-api-0.19.c.tags +d6ce1a168c1625f3818315153acb81323af4be9b05fbd4d945ca0bac27aee36e gladeui-1.0.c.tags +fe69af30826831b12fe1f7dcf68eff524def9de4bdb2cba3af8537548ffb1394 gnt.c.tags +a1aeb5a129c2a86e2ccb9bc1dc5cda04b0173affdac82bd1b4b8efdf76bae68a gtk220.c.tags +3bffa423e1d4ffc90717ed36f79dea57132063a875e6ec461f3ff392f4ea9daa gtkscintilla-2.0.c.tags +557e4337bd2f7e104cdcacd52bb2259aed6f06e581c2cb122d8adb3afa0cbfba gtksourceview-3.0.c.tags +485737f38e869637a79de310fa65bcd6aa30940ea8862b88640029ba65b6c828 libdevhelp-2.0.c.tags +322e33674130c574d7e7cb29cab401c57cc6aa9163a4bd8cd02a7c521d291b03 libgdl-3.0.c.tags +d1799ab0b9f4194549d6ef1456d90607f145ccb41c91e9e13360a7cfd16375bf libxml-2.0.c.tags +5a9f0c7e13fcd4022339a593fe0b6d4b233cd033faccf9676298a70d781f13a5 sqlite3.c.tags +7fda2df27fd515904aac9e2f0854178131a3ff6b72a4ab51a9ca7b9d19ce18a9 standard.css.tags +0ca50e5515fbe0c21895918297f386477a3221ca3f398edce9f8cc61e744f1d9 std.glsl.tags +5c4aab3854f7bb87f1c429a6fca8c771865bbc38bfa4beb9b7bcac1c977c6c32 std.latex.tags +e5a4a8f20311e66d52fb0bc0a357fc4fe7720278f3b9d66e894d570c51cd1e00 std.vala.tags +1979eec23bb793e21e247fcfe66c921c0fa9ad5061e2517743e7041e28e8b982 v4l2.c.tags +977c83a3c58bafc882af373cadbe96e049561d9c0518f1100036d3b9da1ba765 webkit-1.0.c.tags +cd4bbd047c016ab4a30165bb08dde1e3a221f6027810c34280a16227ba9b39ab wordpress.php.tags +f00ce9be4ed50daa73484c28566cc321ccc11f671bcd1200c44a46edd58011ce xfce46.c.tags +0b86e730022702ff028d017e639361f609e4a93e7868f21dd7ff9420a17e3016 tcl.tcl.tags" +sha512sums="eda3194996dc02eec1a312cd9b61431f0dd7f0071ba2bdaee7585386c8b412c0d37a22b5ca4f5cb3ac7c5130d150b701bf64eabd6cc5847d0d050838a5c52b08 geany-1.23.tar.gz +89551143b5557a632b325cceef9c0fa56ea0f9a28d1bd7bed4dba99af5005812702bbf0519f6ce97ce77c362fa454caac8d18c168ffb4af5f91ed6a4df2995e9 dbus-glib-0.76.c.tags +9d06d993ddd3fbc6445a215e327e4d0bfb498bcf0431fff69b66b4fc2163717a313c5a876d0dcd922859f97fb8f5beb20f034dafb99b321be37282f226c76057 drupal.php.tags +1db55822822fe5f9d85ff619c6e2fb9703ed7646eefb8925f8e2f632fb9f6aecaddf1580496e0d9daa9d3d7e466febc80d73ae3955075d1dd92fc238571d5fd1 ethos-1.0.c.tags +3201f66fc6bf75d82b7c2ed0ee694d74a047771e01e81f4fc505df3fcce7389eed750aae1ad09b55b5ef0227d9a92161d32c40117917905059aa3a0fe7c14f3b geany-api-0.19.c.tags +4b9b92fd01ea09fe093a9aa08cb7fc82fc793bc3c61551f383c713be96a85ad599f188c234f1796b85975898570cebf938c997ad8190c89d4c0f2c26a7468cf4 gladeui-1.0.c.tags +a7abfa99736ef6eb4a2bbee68e370b9913624bf432165cafc8b052b4d52b2e7b2cccebcaec8fefba773b4aaf8fa441aa1597ea03aadabc64bad7be0cb0681e35 gnt.c.tags +bb48aec2d4f6ad1d0a853760b60b5a3e26502ff42e74e182a03dd04f0d7b6b47290466f7ac497eb51f2bce5fd6f6c21ee9ac426fbb333171244a52833cee82d7 gtk220.c.tags +0b45a883663ade6c97ba52cfbebea57c0ff54d3195b2bc00209bb62e08566a16b3306399a062020a06b47c20fc210db60ca52cbe2798c4846243dd7dc52c678e gtkscintilla-2.0.c.tags +f7f6256969b4630e6fe28052b278e2858df581bbd39a24892232c0f1aac8d5da2c009bc48a3f6b61d82625f9858e43a0cb0dc9ff7562305fb0fb9637ae8690d6 gtksourceview-3.0.c.tags +81c84b0d4290bd1031fb56c176c98276094eb0e27ae6e55376445577c46991b65fa7fff0d106d8669b2aaea84d264017ec08b145dbe45d598885c5d8f8334f22 libdevhelp-2.0.c.tags +767970487967fe2ae80ae076813116d5b3a04de3427b0c447b7f889f9b04a37747f933b86685f4e8a0be94cbb21f0d841b528511451939dc710f1f34b3d1849e libgdl-3.0.c.tags +0cff6575b23aa5fc94efc0923c085f463c224cbb1b26f696e2be5ca1080a34be01be6a90f5ee2f7191c1bee660e2b3e50c50343cace8df8d0b2ebd3d205ad0d0 libxml-2.0.c.tags +afa5e2e0ffc0cb6aa1462e68fcd213b8c5447718f1ac5719677217a7d60ae2b9adc26662224872f133869fa34d3c18b136c9d909f38752b32b3ecd15616588cd sqlite3.c.tags +0c653aa84886cfd441aab37c11e8462b7540fa4b5f9d479ed09de063a23887b4b5b833a1b3296a4873931ee41b7679155cfd1a70ff535a497ebdef9e211546b0 standard.css.tags +616ede8e41dec4cb97e646c8b447a606c54de52369df11c26d94f5e508643f6eb45805030b48e432420a564effa1217e88fcbd34aa0a487d8c4823c6ddc79d40 std.glsl.tags +90e188d1a7e4da7fb6680870ba936c1ae9637a186f970c3a6e6690ed7f3555e5dca33b4b32c75d3da322e93dd911fd8b5f574201dd15f12ec58f5f163f434a09 std.latex.tags +8b2669f8ef6cfcf6e27bcb3de039e134702353754d62ef6ee7e73cd8cb8cd1d8bdbf9ab07b2fca59c7ff04e1066d8e6b0080fb9d8db573582b857ee471c8b837 std.vala.tags +2d8f30c29b589a892f86a629014ccac36a698eedfd3961d01da73adda1fcd43623451e340d74e8c85c5028d4e2d789c3268f52889bb22c671e06e780123269f5 v4l2.c.tags +9fcea2e6c652ffc351461974924eaee0c5a9d58763e5a37a82e7c20957a1d02c044abaee1834b738f733fb309c1de9f31bd15083b60809527040898e853ca1a1 webkit-1.0.c.tags +fe3f88e86a0f098a2f85df76ddd04978bb8f2bed87ea8cc7c3325ea904f5c625fb2b10757d0f8edaf9e5d483699f79f21648e444b10b7760ee72d0c244ce463f wordpress.php.tags +822ffacbd42c72c459ccd2b44ecfb580c5c65816beaec23638d74d61a8e832c1486b902c3950a892a49b2ce5232533490653ff8bab2194f1b412f16f64c66090 xfce46.c.tags +71012d3f6d11a7b5171c1debce928fe31776af64a4f7c36fc27946fed220b9918c0894932d54c8a2fb55611ca5a458b7f8d3ae05ee269d83e2e704f0baa6b674 tcl.tcl.tags" diff --git a/main/geany/link-gmodule.patch b/main/geany/link-gmodule.patch deleted file mode 100644 index a274f26d30..0000000000 --- a/main/geany/link-gmodule.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/Makefile.in.orig -+++ ./src/Makefile.in -@@ -398,7 +398,7 @@ - # build Geany for Windows on non-Windows systems (cross-compile) - @MINGW_TRUE@geany_SOURCES = $(SRCS) win32.c win32.h - @MINGW_FALSE@geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ --@MINGW_FALSE@ @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -+@MINGW_FALSE@ @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lgmodule-2.0 - - @MINGW_TRUE@geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @MINGW_TRUE@ @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \ diff --git a/main/git/APKBUILD b/main/git/APKBUILD index b6f6ab3a67..f73edb7bbe 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.8.1.5 +pkgver=1.8.2 pkgrel=0 pkgdesc="A distributed version control system" url="http://git.or.cz/" @@ -72,15 +72,15 @@ svn() { mv "$pkgdir"/usr/libexec/git-core/git-svn "$subpkgdir"/usr/libexec/git-core } -md5sums="ce168861c23a700b40ffe94475bb1d9e git-1.8.1.5.tar.gz +md5sums="210834d73c857931c3da34a65eb3e597 git-1.8.2.tar.gz e63a201556c4f089de790805c09a2e5b bb-tar.patch 3f0bdf6ca73bf4f015bc8565ab787969 git-daemon.initd 2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd" -sha256sums="f8b0be6e53e866f83cde64fa947011ebac56077bd1273c2e894038878986b955 git-1.8.1.5.tar.gz +sha256sums="c2f35bcefa4f62a54c4bde41cc0f1cd3ddf03e9a6bc8a79557f1683789f213e6 git-1.8.2.tar.gz cb6319f47d81605e199771350154cbed0a6e85ef9042a689f2b405c64039f49c bb-tar.patch 46725cf0f7feeb55eb07ccb39667aefb261fa9ea45f290f8bae09efd01f0cd1a git-daemon.initd aaa80bd059db549dadf4c4e27a9aa41a4b5def844f8e563c493bc8513dcd981e git-daemon.confd" -sha512sums="19ee4c76c66595f24d5093648202840f39356c111124017beeb32a4d79e8ce362d901ff4a09ad67c1392c5d1e48068a3a4634ad2865d8231e70b197a1cf0fdd3 git-1.8.1.5.tar.gz +sha512sums="08274649a525879e2e5a6940cfd6e8b48c30e551ca1b63c7c73198a4777b643e60a0fd2a51bc6f4623b438d5168dd53c42b4daf87b80d52cfac3cd1cfa368976 git-1.8.2.tar.gz 6fa088a753c2a697e8dbef2032ed63e8c2a0553a41cff2fcff893c2f35c51d2c697054cc921c23ee606f77b93d0f340df85220b15e1c470bd352f7fba3986cd0 bb-tar.patch 3f3c658321a9f50b68109972cc1920e07a7a1ad94977c7e21a2b7ee764895e0f6af2d125c5fbbed95ec65981de562962caa57f4ae9f3969ac9dc1e5f60bc521e git-daemon.initd 9640f8078d68ed2678e5249da3f946fc21f50e858b94127a4221de73c6132101afcd46bc1fe33861e9a7f731c0dc9591915b8ebf376b8e690cd7135703966509 git-daemon.confd" diff --git a/main/gpgme/APKBUILD b/main/gpgme/APKBUILD index bda11b1ff3..7653aafa27 100644 --- a/main/gpgme/APKBUILD +++ b/main/gpgme/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gpgme -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=0 pkgdesc="gnupg made easy" url="http://www.gnupg.org/related_software/gpgme/" @@ -42,4 +42,6 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="90afa8436ce2b2683c001c824bd22601 gpgme-1.3.1.tar.bz2" +md5sums="326fe97077141713f0930aa87949a287 gpgme-1.3.2.tar.bz2" +sha256sums="cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875 gpgme-1.3.2.tar.bz2" +sha512sums="5452aa663a85f7853f8194746ee3f7a70f46af719490df240401b0b9d97b0e2d3656d73dd469f136dc4ba0f878f5ef445f43e682a049a3a99c3ac22de29d79c5 gpgme-1.3.2.tar.bz2" diff --git a/main/gphoto2/APKBUILD b/main/gphoto2/APKBUILD index 2f1eadd6cd..d0856517e7 100644 --- a/main/gphoto2/APKBUILD +++ b/main/gphoto2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gphoto2 -pkgver=2.5.0 -pkgrel=1 +pkgver=2.5.1 +pkgrel=0 pkgdesc="commandline utilities for accessing cameras" url="http://www.gphoto.org/" arch="all" @@ -42,4 +42,6 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="64c6d291c5bd50388af0c51da71efb59 gphoto2-2.5.0.tar.bz2" +md5sums="03cda6d5b7c647ac4c90d0081f2cb7c7 gphoto2-2.5.1.tar.bz2" +sha256sums="4ddd48aa6db00e318de3f4f3d0e1f171eebcc5641bbc0b4eaf2bf0edce31f68b gphoto2-2.5.1.tar.bz2" +sha512sums="46ebf18fa9630bf4502eeeac4dc4fb83d63801682c0855ca9e14aa3e3c2a87015f4656d4e6efa4e3468d153105c1b21532a4f1312b6e5960d8cc062115d05674 gphoto2-2.5.1.tar.bz2" diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD index 9f719c34da..64b2806282 100644 --- a/main/ipset/APKBUILD +++ b/main/ipset/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=ipset -pkgver=6.16.1 +pkgver=6.17 pkgrel=0 pkgdesc="Manage Linux IP sets" url=http://ipset.netfilter.org/ @@ -39,5 +39,9 @@ package() { install -m 755 "$startdir/ipset.initd" "$pkgdir/etc/init.d/ipset" } -md5sums="9fd70c825f052db7dc9d5ba0562b7083 ipset-6.16.1.tar.bz2 +md5sums="9d439e279e02076f29fe7c9c059a5cae ipset-6.17.tar.bz2 bedd95e2ada2f75af1032f9ab63efb3e ipset.initd" +sha256sums="7987bb8de1b0490b32084ab72165ae53038e497a96ab9940920280d8068629b0 ipset-6.17.tar.bz2 +f68ab7e726b96e03c203ac1b71a019a081c635a6ab19021c05756b9695ad94e5 ipset.initd" +sha512sums="668f173b7ddd8a18af2730205e2e2c38610aa9fd191af52f91080e903bcd8e1f38e8e3a7fd57077decb00fd0556df89c3315c91eaffaa6977f2caf2a3300b175 ipset-6.17.tar.bz2 +92832a6722a6ae18a7e5cde445dfe0bb8065de4be2bc24b2a9948cd0da511118b5c5f3515c7c619a0c71444350065c20bce1b215283501e582536c8e88458d05 ipset.initd" diff --git a/main/iso-codes/APKBUILD b/main/iso-codes/APKBUILD index b1570bab1f..b2d39a745b 100644 --- a/main/iso-codes/APKBUILD +++ b/main/iso-codes/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iso-codes -pkgver=3.38 +pkgver=3.41 pkgrel=0 pkgdesc="Lists of the country, language, and currency names" url="http://pkg-isocodes.alioth.debian.org/" @@ -22,4 +22,6 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install || return 1 } -md5sums="df8dacc718116dae3db453a4d85c018a iso-codes-3.38.tar.xz" +md5sums="ee13ecb5c97176c981f996cfd7bce6e8 iso-codes-3.41.tar.xz" +sha256sums="c2e637e43e6c2e8516a898be10180dc620b33b4d7f803281d7db62820ab41275 iso-codes-3.41.tar.xz" +sha512sums="16be9aabd22aa64653052f1e897bed0d8e1e59f84389296de774def9af18f46e9c93c7941914e4f9a5b200963a72b498e64af3ff15d04101d1b9c5f4c44c6067 iso-codes-3.41.tar.xz" diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD index 2c6e2d7f22..e3a96190d8 100644 --- a/main/lftp/APKBUILD +++ b/main/lftp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=lftp -pkgver=4.4.4 +pkgver=4.4.5 pkgrel=0 pkgdesc="LFTP is sophisticated ftp/http client" url="http://lftp.yar.ru/" @@ -41,6 +41,6 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="f1fa7aec113219952d18e4dd87d531ca lftp-4.4.4.tar.bz2" -sha256sums="8c5f1e57c497b2ad0b512071b802270544f627c614e5833633f35e6fb9f768cc lftp-4.4.4.tar.bz2" -sha512sums="b59c726fead60a96eeae87b1bb1d7f89f36e9e06501bdaaea13be80c1129eb8ad3c2a857ff5f3b6c890d11a7bafcf6e59ebda4d6646e918a3771a0e72385b5e8 lftp-4.4.4.tar.bz2" +md5sums="a8abdc87a00174571908ffaf5cdffd45 lftp-4.4.5.tar.bz2" +sha256sums="0ce93e3c1144920b1accbf0922af4aaef149b7e117ed150513faf06c55329cf1 lftp-4.4.5.tar.bz2" +sha512sums="db0a603163018f4f0363ae75cd632271e6333341b7afedbfbdca1c7b9b3fb8f68211a0e402a6a652c82e411c31273bf8c0403fb6a6ab891f806a08cab2724396 lftp-4.4.5.tar.bz2" diff --git a/main/libgphoto2/APKBUILD b/main/libgphoto2/APKBUILD index 91b28ba58b..4cfa078a65 100644 --- a/main/libgphoto2/APKBUILD +++ b/main/libgphoto2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgphoto2 -pkgver=2.5.0 -pkgrel=1 +pkgver=2.5.1 +pkgrel=0 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." url="http://www.gphoto.org" arch="all" @@ -39,4 +39,6 @@ package() { "$pkgdir/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 group camera mode 0660 > "$pkgdir/lib/udev/rules.d/54-gphoto.rules" || return 1 } -md5sums="467638d80ec0ef057999361aeb49d123 libgphoto2-2.5.0.tar.bz2" +md5sums="66a54d320ee908eb0e26bfe2c03e30ed libgphoto2-2.5.1.tar.bz2" +sha256sums="0f61c721cac4d96cf4435a4881689f43b004b109d15501fb575ee5798679c7b7 libgphoto2-2.5.1.tar.bz2" +sha512sums="5a471cf3715b7b82cbb1232ef6041b8cbe43e92d412d650a26c80c60976d6d089c30281781c32c7dff1be78f09f54ca2ab9c4f3501460bd099f576e288bdd30e libgphoto2-2.5.1.tar.bz2" diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD index fc809759d9..4de038b5ee 100644 --- a/main/libusb/APKBUILD +++ b/main/libusb/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Library to enable user space application programs to communicate with USB devices" url="http://libusb.sourceforge.net/" arch="all" -license="LGPL" +license="LGPL2+" subpackages="$pkgname-dev" depends="" makedepends="" diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD index 08735a33a0..b42810adca 100644 --- a/main/linux-firmware/APKBUILD +++ b/main/linux-firmware/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=linux-firmware -pkgver=20121217 +pkgver=20130313 pkgrel=0 pkgdesc="firmware files for linux" #url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary" @@ -51,4 +51,6 @@ package() { mv "${_builddir}" ${pkgdir}/lib/firmware } -md5sums="877d3bf989570d5f124cb342cb6e7e42 linux-firmware-20121217.tar.gz" +md5sums="556a1cb2852b244f4a7c591727539d8b linux-firmware-20130313.tar.gz" +sha256sums="9968315324d2c6486b1050889a8843e6aa671da5b94f72761a5cf8b46b52a791 linux-firmware-20130313.tar.gz" +sha512sums="8c7c5dda56ab3bdd5bb4baf4ce5494965024e22163d3d66dd98f506578f13ce409dbe8e898cffeb104d3ad1880c03cc705f475b3e1a2f7e323aebc18413b3ecb linux-firmware-20130313.tar.gz" diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 84ad89a591..eaf248d79e 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,7 +2,7 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=3.8.2 +pkgver=3.8.3 _kernver=3.8 pkgrel=0 pkgdesc="Linux kernel with grsecurity" @@ -14,10 +14,10 @@ _config=${config:-kernelconfig.${CARCH}} install= source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz - grsecurity-2.9.1-3.8.2-201303102007.patch + grsecurity-2.9.1-3.8.3-201303142235.patch 0004-arp-flush-arp-cache-on-device-change.patch - usb-ehci-revert-remove-ass-pss-polling-timeout.patch + Revert-ip_gre-make-ipgre_tunnel_xmit-not-parse-network-header-as-IP-unconditionally.patch kernelconfig.x86 kernelconfig.x86_64 @@ -142,23 +142,23 @@ dev() { } md5sums="1c738edfc54e7c65faeb90c436104e2f linux-3.8.tar.xz -e282fcff76e975e121e0636018e31a56 patch-3.8.2.xz -b7f8fd74ca2355e04bd6fb9761ff4b5f grsecurity-2.9.1-3.8.2-201303102007.patch +ba18b5d27ed303f5e5a9cda32a451031 patch-3.8.3.xz +3574d5894912cc52b5a96b5c1111dd4b grsecurity-2.9.1-3.8.3-201303142235.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch -eb332f6769f785a1c6b54b1f49ffd01a usb-ehci-revert-remove-ass-pss-polling-timeout.patch -3bcafb0c6230e2279930027e48162d0a kernelconfig.x86 -653949f92e603ec35e072fbdc58a414b kernelconfig.x86_64" +dc52c70012b707fa8ebbfe9222960b1f Revert-ip_gre-make-ipgre_tunnel_xmit-not-parse-network-header-as-IP-unconditionally.patch +8aaa5522e194fc8065eaaeba9c15ac43 kernelconfig.x86 +b3f2c86c9eb241f79968333c226d31a6 kernelconfig.x86_64" sha256sums="e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b linux-3.8.tar.xz -2bd1a39db4608a03250bfef11d3b7894ab1f0ebcb5316bafeeed23535822fd9c patch-3.8.2.xz -13ba06a41de3198729867c7fe5741b01a138298bc1d973dfcd8a3bec80127d01 grsecurity-2.9.1-3.8.2-201303102007.patch +02b70097dcfbce05ccbfbd5fae6449a811b26a776f89d3c2fdd155b7d086ea82 patch-3.8.3.xz +9411484c383b5119053b6c1aff1d9e3eb6026304bd1b854b4275caa633759f7b grsecurity-2.9.1-3.8.3-201303142235.patch e2d2d1503f53572c6a2e21da729a13a430dd01f510405ffb3a33b29208860bde 0004-arp-flush-arp-cache-on-device-change.patch -949393b84740cfe8a0d72d391ca2a89d24aa425df27c031f121fec7f7f331eed usb-ehci-revert-remove-ass-pss-polling-timeout.patch -f4f752af87b802ddfa201392906c4b7ec14a2239e994abd3fb08068824477cb4 kernelconfig.x86 -07e8251d7348414ee534d822fdf6561545309be87821032115d0161c443ad000 kernelconfig.x86_64" +82687b6a369370359bab20fcd00e7e6ca55221d9777843d6df857f7e808d9916 Revert-ip_gre-make-ipgre_tunnel_xmit-not-parse-network-header-as-IP-unconditionally.patch +a3f40ac4fdca289151aef0f95b3f7f9f0c06bc15ddc5385cb3a9053f7be850db kernelconfig.x86 +f1a630d79d09eb914f516f2700e9f77c8b31c9d67c7abec38fd7422e5bb74df2 kernelconfig.x86_64" sha512sums="10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f linux-3.8.tar.xz -752a122646261461da9238feeacc61ab787bea9999f066b056226387ce718da57592e536eb1c6aa28b949f0a7ad1fa97cc97204fdc3e8f3939d9b0d3b9517d03 patch-3.8.2.xz -4d7bf6b3635b9b6a673fd43eed6cd7f60ef18645b2447be521ac7e8fac9a8d6e38eba7d273dd654fad162c6171d0d5f8aa99b57662f669ff00dbede0626793de grsecurity-2.9.1-3.8.2-201303102007.patch +14c4ffe8da8024ec77b16b21e959453c84b3693027a1746533c03dac74e4f8f8d1b385d9e697207cbb701a7a60aa1950d44e02dde9f3a964d4b49467cb07f0be patch-3.8.3.xz +219e1e9dea3816df3677d66a32a39a4ce55ff88a72f1e0b7c410cc1de4adffcc9b0b311301b3afd5eb01a98c2fc54ce5eb07bd0293267016d12cbefd5dc5b18c grsecurity-2.9.1-3.8.3-201303142235.patch b6fdf376009f0f0f3fa194cb11be97343e4d394cf5d3547de6cfca8ad619c5bd3f60719331fd8cfadc47f09d22be8376ba5f871b46b24887ea73fe47e233a54e 0004-arp-flush-arp-cache-on-device-change.patch -bb4576df6b5e029747975f5ed9d04c807d1bfd5e73f5418375f164a03342c15b2ca918e68bb6ff5bd0dc2fa8364e022aee18b254528210d2e24f8e06e6521609 usb-ehci-revert-remove-ass-pss-polling-timeout.patch -9a37f22bbab39e7a2a35258a5004ad52e7ec40d1cb7e0e61df3e7c278fd1e0163f196fbb0110ef34b1984c5fae409c57b870e689f955c8520c2b27aa0afe8247 kernelconfig.x86 -e77717d46bdbb4bdf7d59a8ee9a9cf62f08b50f0e0b6dc3bf78cf007fce355b19a824205d1341bbb730708f5651f0b244d90d3b771b968b16af7ba4ca7ae8d58 kernelconfig.x86_64" +86658aab1274eb7b273dc13473e3bd21d2c8cc8253002adf175dd0e0fd3b407c0ec85546f018597bbf5ad1b47b426a03c3be7b7a5d19991c46c7bd5afddf9929 Revert-ip_gre-make-ipgre_tunnel_xmit-not-parse-network-header-as-IP-unconditionally.patch +e3997c52b719073cfd5d6f17c3f9512be7af6c786d4374b987e9b26fc55132b78543df9536964ce7c90884ed6126c4d32b374a5e1b656ddb4b7249eccc945848 kernelconfig.x86 +ea62be084f031f4785eaaa691b4d8131bdc5d715d6be78579ecf300fafca979a49d77b5b29075d5c2016f82a210e930e87186c4f717b6a1edb0bcaa3f17d49e3 kernelconfig.x86_64" diff --git a/main/linux-grsec/Revert-ip_gre-make-ipgre_tunnel_xmit-not-parse-network-header-as-IP-unconditionally.patch b/main/linux-grsec/Revert-ip_gre-make-ipgre_tunnel_xmit-not-parse-network-header-as-IP-unconditionally.patch new file mode 100644 index 0000000000..39277d52c8 --- /dev/null +++ b/main/linux-grsec/Revert-ip_gre-make-ipgre_tunnel_xmit-not-parse-network-header-as-IP-unconditionally.patch @@ -0,0 +1,49 @@ +From patchwork Wed Mar 13 12:37:49 2013 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as + IP unconditionally" +Date: Wed, 13 Mar 2013 02:37:49 -0000 +From: =?utf-8?b?VGltbyBUZXLDpHMgPHRpbW8udGVyYXNAaWtpLmZpPg==?= +X-Patchwork-Id: 227266 +Message-Id: <1363178269-27553-1-git-send-email-timo.teras@iki.fi> +To: netdev@vger.kernel.org, Isaku Yamahata <yamahata@valinux.co.jp>, + Eric Dumazet <edumazet@google.com>, "David S. Miller" <davem@davemloft.net> +Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> + +This reverts commit 412ed94744d16806fbec3bd250fd94e71cde5a1f. + +The commit is wrong as tiph points to the outer IPv4 header which is +installed at ipgre_header() and not the inner one which is protocol dependant. + +This commit broke succesfully opennhrp which use PF_PACKET socket with +ETH_P_NHRP protocol. Additionally ssl_addr is set to the link-layer +IPv4 address. This address is written by ipgre_header() to the skb +earlier, and this is the IPv4 header tiph should point to - regardless +of the inner protocol payload. + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> + +--- +net/ipv4/ip_gre.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +This commit appeared in 3.8.x. So should go to 3.8.x-stable. + +diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c +index d0ef0e6..91d66db 100644 +--- a/net/ipv4/ip_gre.c ++++ b/net/ipv4/ip_gre.c +@@ -798,10 +798,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev + + if (dev->header_ops && dev->type == ARPHRD_IPGRE) { + gre_hlen = 0; +- if (skb->protocol == htons(ETH_P_IP)) +- tiph = (const struct iphdr *)skb->data; +- else +- tiph = &tunnel->parms.iph; ++ tiph = (const struct iphdr *)skb->data; + } else { + gre_hlen = tunnel->hlen; + tiph = &tunnel->parms.iph; diff --git a/main/linux-grsec/grsecurity-2.9.1-3.8.2-201303102007.patch b/main/linux-grsec/grsecurity-2.9.1-3.8.3-201303142235.patch index e5f056b25e..ef25e2b46d 100644 --- a/main/linux-grsec/grsecurity-2.9.1-3.8.2-201303102007.patch +++ b/main/linux-grsec/grsecurity-2.9.1-3.8.3-201303142235.patch @@ -259,7 +259,7 @@ index 986614d..e8bfedc 100644 pcd. [PARIDE] diff --git a/Makefile b/Makefile -index 20d5318..d5cec9c 100644 +index 8c49fc9b..9a2af09 100644 --- a/Makefile +++ b/Makefile @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -1540,13 +1540,13 @@ index 7eb18c1..e38b6d2 100644 #include <asm-generic/cmpxchg-local.h> diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h -index ab98fdd..6b19938 100644 +index 720799f..2f67631 100644 --- a/arch/arm/include/asm/delay.h +++ b/arch/arm/include/asm/delay.h -@@ -24,9 +24,9 @@ extern struct arm_delay_ops { - void (*delay)(unsigned long); +@@ -25,9 +25,9 @@ extern struct arm_delay_ops { void (*const_udelay)(unsigned long); void (*udelay)(unsigned long); + bool const_clock; -} arm_delay_ops; +} *arm_delay_ops; @@ -1555,7 +1555,7 @@ index ab98fdd..6b19938 100644 /* * This function intentionally does not exist; if you see references to -@@ -47,8 +47,8 @@ extern void __bad_udelay(void); +@@ -48,8 +48,8 @@ extern void __bad_udelay(void); * first constant multiplications gets optimized away if the delay is * a constant) */ @@ -1977,7 +1977,7 @@ index a3f3792..7b932a6 100644 #define L_PTE_DIRTY_HIGH (1 << (55 - 32)) diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h -index 9c82f988..514705a 100644 +index c094749..fd8272e 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -30,6 +30,9 @@ @@ -2062,12 +2062,13 @@ index 9c82f988..514705a 100644 */ #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG -@@ -240,7 +290,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } +@@ -240,8 +290,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { -- const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | L_PTE_NONE; -+ const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | L_PTE_NONE | __supported_pte_mask; +- const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | +- L_PTE_NONE | L_PTE_VALID; ++ const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | L_PTE_NONE | L_PTE_VALID | __supported_pte_mask; pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask); return pte; } @@ -2723,7 +2724,7 @@ index 2adda11..7fbe958 100644 flush_icache_range(0xffff001c, 0xffff001c + length); if (!vectors_high()) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S -index 486a15a..2d6880e 100644 +index e0eb9a1..c7d74a3 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -52,7 +52,9 @@ @@ -2737,7 +2738,7 @@ index 486a15a..2d6880e 100644 .endm /* -@@ -416,7 +418,7 @@ __enable_mmu: +@@ -434,7 +436,7 @@ __enable_mmu: mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \ domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \ domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \ @@ -2967,7 +2968,7 @@ index 3f6cbb2..6d856f5 100644 #ifdef MULTI_TLB cpu_tlb = *list->tlb; diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c -index 84f4cbf..672f5b8 100644 +index 58af91c..343ce99 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -70,7 +70,7 @@ enum ipi_msg_type { @@ -3196,7 +3197,7 @@ index 7d08b43..f7ca7ea 100644 #include "csumpartialcopygeneric.S" diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c -index 0dc5385..45833ef 100644 +index 6b93f6a..88d9b64 100644 --- a/arch/arm/lib/delay.c +++ b/arch/arm/lib/delay.c @@ -28,12 +28,14 @@ @@ -3215,7 +3216,7 @@ index 0dc5385..45833ef 100644 static const struct delay_timer *delay_timer; static bool delay_calibrated; -@@ -67,6 +69,12 @@ static void __timer_udelay(unsigned long usecs) +@@ -67,6 +69,13 @@ static void __timer_udelay(unsigned long usecs) __timer_const_udelay(usecs * UDELAY_MULT); } @@ -3223,18 +3224,20 @@ index 0dc5385..45833ef 100644 + .delay = __timer_delay, + .const_udelay = __timer_const_udelay, + .udelay = __timer_udelay, ++ .const_clock = true, +}; + void __init register_current_timer_delay(const struct delay_timer *timer) { if (!delay_calibrated) { -@@ -74,9 +82,7 @@ void __init register_current_timer_delay(const struct delay_timer *timer) +@@ -74,10 +83,7 @@ void __init register_current_timer_delay(const struct delay_timer *timer) delay_timer = timer; lpj_fine = timer->freq / HZ; loops_per_jiffy = lpj_fine; - arm_delay_ops.delay = __timer_delay; - arm_delay_ops.const_udelay = __timer_const_udelay; - arm_delay_ops.udelay = __timer_udelay; +- arm_delay_ops.const_clock = true; + arm_delay_ops = &arm_timer_delay_ops; delay_calibrated = true; } else { @@ -3302,6 +3305,53 @@ index 0abb30f..54064da 100644 .late_init = n8x0_menelaus_late_init, }; +diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c +index 8033cb7..2f7cb62 100644 +--- a/arch/arm/mach-omap2/gpmc.c ++++ b/arch/arm/mach-omap2/gpmc.c +@@ -139,7 +139,6 @@ struct omap3_gpmc_regs { + }; + + static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ]; +-static struct irq_chip gpmc_irq_chip; + static unsigned gpmc_irq_start; + + static struct resource gpmc_mem_root; +@@ -700,6 +699,18 @@ static void gpmc_irq_noop(struct irq_data *data) { } + + static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; } + ++static struct irq_chip gpmc_irq_chip = { ++ .name = "gpmc", ++ .irq_startup = gpmc_irq_noop_ret, ++ .irq_enable = gpmc_irq_enable, ++ .irq_disable = gpmc_irq_disable, ++ .irq_shutdown = gpmc_irq_noop, ++ .irq_ack = gpmc_irq_noop, ++ .irq_mask = gpmc_irq_noop, ++ .irq_unmask = gpmc_irq_noop, ++ ++}; ++ + static int gpmc_setup_irq(void) + { + int i; +@@ -714,15 +725,6 @@ static int gpmc_setup_irq(void) + return gpmc_irq_start; + } + +- gpmc_irq_chip.name = "gpmc"; +- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret; +- gpmc_irq_chip.irq_enable = gpmc_irq_enable; +- gpmc_irq_chip.irq_disable = gpmc_irq_disable; +- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop; +- gpmc_irq_chip.irq_ack = gpmc_irq_noop; +- gpmc_irq_chip.irq_mask = gpmc_irq_noop; +- gpmc_irq_chip.irq_unmask = gpmc_irq_noop; +- + gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE; + gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT; + diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index 5d3b4f4..ddba3c0 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c @@ -3315,6 +3365,49 @@ index 5d3b4f4..ddba3c0 100644 .notifier_call = irq_cpu_hotplug_notify, }; +diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c +index e065daa..7b1ad9b 100644 +--- a/arch/arm/mach-omap2/omap_device.c ++++ b/arch/arm/mach-omap2/omap_device.c +@@ -686,7 +686,7 @@ void omap_device_delete(struct omap_device *od) + * passes along the return value of omap_device_build_ss(). + */ + struct platform_device __init *omap_device_build(const char *pdev_name, int pdev_id, +- struct omap_hwmod *oh, void *pdata, ++ struct omap_hwmod *oh, const void *pdata, + int pdata_len, + struct omap_device_pm_latency *pm_lats, + int pm_lats_cnt, int is_early_device) +@@ -720,7 +720,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name, int pdev + */ + struct platform_device __init *omap_device_build_ss(const char *pdev_name, int pdev_id, + struct omap_hwmod **ohs, int oh_cnt, +- void *pdata, int pdata_len, ++ const void *pdata, int pdata_len, + struct omap_device_pm_latency *pm_lats, + int pm_lats_cnt, int is_early_device) + { +diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h +index 0933c59..42b8e2d 100644 +--- a/arch/arm/mach-omap2/omap_device.h ++++ b/arch/arm/mach-omap2/omap_device.h +@@ -91,14 +91,14 @@ int omap_device_shutdown(struct platform_device *pdev); + /* Core code interface */ + + struct platform_device *omap_device_build(const char *pdev_name, int pdev_id, +- struct omap_hwmod *oh, void *pdata, ++ struct omap_hwmod *oh, const void *pdata, + int pdata_len, + struct omap_device_pm_latency *pm_lats, + int pm_lats_cnt, int is_early_device); + + struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id, + struct omap_hwmod **oh, int oh_cnt, +- void *pdata, int pdata_len, ++ const void *pdata, int pdata_len, + struct omap_device_pm_latency *pm_lats, + int pm_lats_cnt, int is_early_device); + diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 4653efb..8c60bf7 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c @@ -4118,19 +4211,6 @@ index a5bc92d..0bb4730 100644 omap_sram_size - omap_sram_skip); + pax_close_kernel(); } -diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h -index b76c065..b6e766b 100644 ---- a/arch/arm/plat-orion/include/plat/addr-map.h -+++ b/arch/arm/plat-orion/include/plat/addr-map.h -@@ -27,7 +27,7 @@ struct orion_addr_map_cfg { - value in bridge_virt_base */ - void __iomem *(*win_cfg_base) (const struct orion_addr_map_cfg *cfg, - const int win); --}; -+} __no_const; - - /* - * Information needed to setup one address mapping. diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h index f5144cd..71f6d1f 100644 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h @@ -21922,7 +22002,7 @@ index b629bbe..0fa615a 100644 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c -index 85c3959..76b89f9 100644 +index 2cb9470..ff1fd80 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -43,11 +43,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src) @@ -30565,10 +30645,10 @@ index 431e875..cbb23f3 100644 -} -__setup("vdso=", vdso_setup); diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c -index e014092..c76ab69 100644 +index 2262003..f229ced 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c -@@ -99,8 +99,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); +@@ -100,8 +100,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -30577,7 +30657,7 @@ index e014092..c76ab69 100644 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE); __read_mostly int xen_have_vector_callback; EXPORT_SYMBOL_GPL(xen_have_vector_callback); -@@ -495,8 +493,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr) +@@ -496,8 +494,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr) { unsigned long va = dtr->address; unsigned int size = dtr->size + 1; @@ -30587,7 +30667,7 @@ index e014092..c76ab69 100644 int f; /* -@@ -544,8 +541,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr) +@@ -545,8 +542,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr) { unsigned long va = dtr->address; unsigned int size = dtr->size + 1; @@ -30597,7 +30677,7 @@ index e014092..c76ab69 100644 int f; /* -@@ -938,7 +934,7 @@ static u32 xen_safe_apic_wait_icr_idle(void) +@@ -939,7 +935,7 @@ static u32 xen_safe_apic_wait_icr_idle(void) return 0; } @@ -30606,7 +30686,7 @@ index e014092..c76ab69 100644 { apic->read = xen_apic_read; apic->write = xen_apic_write; -@@ -1244,30 +1240,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = { +@@ -1245,30 +1241,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = { #endif }; @@ -30644,7 +30724,7 @@ index e014092..c76ab69 100644 { if (pm_power_off) pm_power_off(); -@@ -1369,7 +1365,17 @@ asmlinkage void __init xen_start_kernel(void) +@@ -1370,7 +1366,17 @@ asmlinkage void __init xen_start_kernel(void) __userpte_alloc_gfp &= ~__GFP_HIGHMEM; /* Work out if we support NX */ @@ -30663,7 +30743,7 @@ index e014092..c76ab69 100644 xen_setup_features(); -@@ -1398,14 +1404,7 @@ asmlinkage void __init xen_start_kernel(void) +@@ -1399,14 +1405,7 @@ asmlinkage void __init xen_start_kernel(void) pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit; } @@ -30679,7 +30759,7 @@ index e014092..c76ab69 100644 xen_smp_init(); -@@ -1590,7 +1589,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self, +@@ -1598,7 +1597,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } @@ -31090,93 +31170,6 @@ index 9a87daa..fb17486 100644 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; -diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c -index 533de95..7d4a8d2 100644 ---- a/crypto/ablkcipher.c -+++ b/crypto/ablkcipher.c -@@ -388,9 +388,9 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) - { - struct crypto_report_blkcipher rblkcipher; - -- snprintf(rblkcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "ablkcipher"); -- snprintf(rblkcipher.geniv, CRYPTO_MAX_ALG_NAME, "%s", -- alg->cra_ablkcipher.geniv ?: "<default>"); -+ strncpy(rblkcipher.type, "ablkcipher", sizeof(rblkcipher.type)); -+ strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<default>", -+ sizeof(rblkcipher.geniv)); - - rblkcipher.blocksize = alg->cra_blocksize; - rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize; -@@ -469,9 +469,9 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg) - { - struct crypto_report_blkcipher rblkcipher; - -- snprintf(rblkcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "givcipher"); -- snprintf(rblkcipher.geniv, CRYPTO_MAX_ALG_NAME, "%s", -- alg->cra_ablkcipher.geniv ?: "<built-in>"); -+ strncpy(rblkcipher.type, "givcipher", sizeof(rblkcipher.type)); -+ strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<built-in>", -+ sizeof(rblkcipher.geniv)); - - rblkcipher.blocksize = alg->cra_blocksize; - rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize; -diff --git a/crypto/aead.c b/crypto/aead.c -index 0b8121e..27bc487 100644 ---- a/crypto/aead.c -+++ b/crypto/aead.c -@@ -117,9 +117,8 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) - struct crypto_report_aead raead; - struct aead_alg *aead = &alg->cra_aead; - -- snprintf(raead.type, CRYPTO_MAX_ALG_NAME, "%s", "aead"); -- snprintf(raead.geniv, CRYPTO_MAX_ALG_NAME, "%s", -- aead->geniv ?: "<built-in>"); -+ strncpy(raead.type, "aead", sizeof(raead.type)); -+ strncpy(raead.geniv, aead->geniv ?: "<built-in>", sizeof(raead.geniv)); - - raead.blocksize = alg->cra_blocksize; - raead.maxauthsize = aead->maxauthsize; -@@ -203,8 +202,8 @@ static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg) - struct crypto_report_aead raead; - struct aead_alg *aead = &alg->cra_aead; - -- snprintf(raead.type, CRYPTO_MAX_ALG_NAME, "%s", "nivaead"); -- snprintf(raead.geniv, CRYPTO_MAX_ALG_NAME, "%s", aead->geniv); -+ strncpy(raead.type, "nivaead", sizeof(raead.type)); -+ strncpy(raead.geniv, aead->geniv, sizeof(raead.geniv)); - - raead.blocksize = alg->cra_blocksize; - raead.maxauthsize = aead->maxauthsize; -diff --git a/crypto/ahash.c b/crypto/ahash.c -index 3887856..793a27f 100644 ---- a/crypto/ahash.c -+++ b/crypto/ahash.c -@@ -404,7 +404,7 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg) - { - struct crypto_report_hash rhash; - -- snprintf(rhash.type, CRYPTO_MAX_ALG_NAME, "%s", "ahash"); -+ strncpy(rhash.type, "ahash", sizeof(rhash.type)); - - rhash.blocksize = alg->cra_blocksize; - rhash.digestsize = __crypto_hash_alg_common(alg)->digestsize; -diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c -index a8d85a1..c44e014 100644 ---- a/crypto/blkcipher.c -+++ b/crypto/blkcipher.c -@@ -499,9 +499,9 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) - { - struct crypto_report_blkcipher rblkcipher; - -- snprintf(rblkcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "blkcipher"); -- snprintf(rblkcipher.geniv, CRYPTO_MAX_ALG_NAME, "%s", -- alg->cra_blkcipher.geniv ?: "<default>"); -+ strncpy(rblkcipher.type, "blkcipher", sizeof(rblkcipher.type)); -+ strncpy(rblkcipher.geniv, alg->cra_blkcipher.geniv ?: "<default>", -+ sizeof(rblkcipher.geniv)); - - rblkcipher.blocksize = alg->cra_blocksize; - rblkcipher.min_keysize = alg->cra_blkcipher.min_keysize; diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 7bdd61b..afec999 100644 --- a/crypto/cryptd.c @@ -31200,7 +31193,7 @@ index 7bdd61b..afec999 100644 static void cryptd_queue_worker(struct work_struct *work); diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c -index 35d700a..dfd511f 100644 +index f6d9baf..dfd511f 100644 --- a/crypto/crypto_user.c +++ b/crypto/crypto_user.c @@ -30,6 +30,8 @@ @@ -31212,55 +31205,6 @@ index 35d700a..dfd511f 100644 static DEFINE_MUTEX(crypto_cfg_mutex); /* The crypto netlink socket */ -@@ -75,7 +77,7 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg) - { - struct crypto_report_cipher rcipher; - -- snprintf(rcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "cipher"); -+ strncpy(rcipher.type, "cipher", sizeof(rcipher.type)); - - rcipher.blocksize = alg->cra_blocksize; - rcipher.min_keysize = alg->cra_cipher.cia_min_keysize; -@@ -94,8 +96,7 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg) - { - struct crypto_report_comp rcomp; - -- snprintf(rcomp.type, CRYPTO_MAX_ALG_NAME, "%s", "compression"); -- -+ strncpy(rcomp.type, "compression", sizeof(rcomp.type)); - if (nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS, - sizeof(struct crypto_report_comp), &rcomp)) - goto nla_put_failure; -@@ -108,12 +109,14 @@ nla_put_failure: - static int crypto_report_one(struct crypto_alg *alg, - struct crypto_user_alg *ualg, struct sk_buff *skb) - { -- memcpy(&ualg->cru_name, &alg->cra_name, sizeof(ualg->cru_name)); -- memcpy(&ualg->cru_driver_name, &alg->cra_driver_name, -- sizeof(ualg->cru_driver_name)); -- memcpy(&ualg->cru_module_name, module_name(alg->cra_module), -- CRYPTO_MAX_ALG_NAME); -+ strncpy(ualg->cru_name, alg->cra_name, sizeof(ualg->cru_name)); -+ strncpy(ualg->cru_driver_name, alg->cra_driver_name, -+ sizeof(ualg->cru_driver_name)); -+ strncpy(ualg->cru_module_name, module_name(alg->cra_module), -+ sizeof(ualg->cru_module_name)); - -+ ualg->cru_type = 0; -+ ualg->cru_mask = 0; - ualg->cru_flags = alg->cra_flags; - ualg->cru_refcnt = atomic_read(&alg->cra_refcnt); - -@@ -122,8 +125,7 @@ static int crypto_report_one(struct crypto_alg *alg, - if (alg->cra_flags & CRYPTO_ALG_LARVAL) { - struct crypto_report_larval rl; - -- snprintf(rl.type, CRYPTO_MAX_ALG_NAME, "%s", "larval"); -- -+ strncpy(rl.type, "larval", sizeof(rl.type)); - if (nla_put(skb, CRYPTOCFGA_REPORT_LARVAL, - sizeof(struct crypto_report_larval), &rl)) - goto nla_put_failure; @@ -196,7 +198,10 @@ static int crypto_report(struct sk_buff *in_skb, struct nlmsghdr *in_nlh, struct crypto_dump_info info; int err; @@ -31303,47 +31247,6 @@ index 35d700a..dfd511f 100644 if (strlen(p->cru_driver_name)) exact = 1; -diff --git a/crypto/pcompress.c b/crypto/pcompress.c -index 04e083f..7140fe7 100644 ---- a/crypto/pcompress.c -+++ b/crypto/pcompress.c -@@ -53,8 +53,7 @@ static int crypto_pcomp_report(struct sk_buff *skb, struct crypto_alg *alg) - { - struct crypto_report_comp rpcomp; - -- snprintf(rpcomp.type, CRYPTO_MAX_ALG_NAME, "%s", "pcomp"); -- -+ strncpy(rpcomp.type, "pcomp", sizeof(rpcomp.type)); - if (nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS, - sizeof(struct crypto_report_comp), &rpcomp)) - goto nla_put_failure; -diff --git a/crypto/rng.c b/crypto/rng.c -index f3b7894..e0a25c2 100644 ---- a/crypto/rng.c -+++ b/crypto/rng.c -@@ -65,7 +65,7 @@ static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg) - { - struct crypto_report_rng rrng; - -- snprintf(rrng.type, CRYPTO_MAX_ALG_NAME, "%s", "rng"); -+ strncpy(rrng.type, "rng", sizeof(rrng.type)); - - rrng.seedsize = alg->cra_rng.seedsize; - -diff --git a/crypto/shash.c b/crypto/shash.c -index f426330f..929058a 100644 ---- a/crypto/shash.c -+++ b/crypto/shash.c -@@ -530,7 +530,8 @@ static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) - struct crypto_report_hash rhash; - struct shash_alg *salg = __crypto_shash_alg(alg); - -- snprintf(rhash.type, CRYPTO_MAX_ALG_NAME, "%s", "shash"); -+ strncpy(rhash.type, "shash", sizeof(rhash.type)); -+ - rhash.blocksize = alg->cra_blocksize; - rhash.digestsize = salg->digestsize; - diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h index f220d64..d359ad6 100644 --- a/drivers/acpi/apei/apei-internal.h @@ -33545,7 +33448,7 @@ index b66eaa0..2619d1b 100644 if (cmd != SIOCWANDEV) diff --git a/drivers/char/random.c b/drivers/char/random.c -index 85e81ec..a129a39 100644 +index 57d4b15..253207b 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -272,8 +272,13 @@ @@ -33591,7 +33494,7 @@ index 85e81ec..a129a39 100644 smp_wmb(); if (out) -@@ -1020,7 +1032,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf, +@@ -1024,7 +1036,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf, extract_buf(r, tmp); i = min_t(int, nbytes, EXTRACT_SIZE); @@ -33600,7 +33503,7 @@ index 85e81ec..a129a39 100644 ret = -EFAULT; break; } -@@ -1356,7 +1368,7 @@ EXPORT_SYMBOL(generate_random_uuid); +@@ -1360,7 +1372,7 @@ EXPORT_SYMBOL(generate_random_uuid); #include <linux/sysctl.h> static int min_read_thresh = 8, min_write_thresh; @@ -33609,7 +33512,7 @@ index 85e81ec..a129a39 100644 static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -@@ -1372,7 +1384,7 @@ static char sysctl_bootid[16]; +@@ -1376,7 +1388,7 @@ static char sysctl_bootid[16]; static int proc_do_uuid(ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -33758,32 +33661,6 @@ index 8ae1a61..9c00613 100644 .notifier_call = arch_timer_cpu_notify, }; -diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c -index fce2000..1110478 100644 ---- a/drivers/connector/cn_proc.c -+++ b/drivers/connector/cn_proc.c -@@ -313,6 +313,12 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, - (task_active_pid_ns(current) != &init_pid_ns)) - return; - -+ /* Can only change if privileged. */ -+ if (!capable(CAP_NET_ADMIN)) { -+ err = EPERM; -+ goto out; -+ } -+ - mc_op = (enum proc_cn_mcast_op *)msg->data; - switch (*mc_op) { - case PROC_CN_MCAST_LISTEN: -@@ -325,6 +331,8 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, - err = EINVAL; - break; - } -+ -+out: - cn_proc_ack(err, msg->seq, msg->ack); - } - diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 7b0d49d..134fac9 100644 --- a/drivers/cpufreq/acpi-cpufreq.c @@ -34262,10 +34139,10 @@ index 94a58a0..f5eba42 100644 container_of(_dev_attr, struct dmi_device_attribute, dev_attr) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c -index 982f1f5..d21e5da 100644 +index 4cd392d..4b629e1 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c -@@ -491,11 +491,6 @@ void __init dmi_scan_machine(void) +@@ -490,11 +490,6 @@ void __init dmi_scan_machine(void) } } else { @@ -34277,7 +34154,7 @@ index 982f1f5..d21e5da 100644 p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -@@ -770,7 +765,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *), +@@ -769,7 +764,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *), if (buf == NULL) return -1; @@ -34287,7 +34164,7 @@ index 982f1f5..d21e5da 100644 iounmap(buf); return 0; diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c -index bcb201c..4fd34dd 100644 +index 2a2e145..73745e79 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -133,7 +133,7 @@ struct efivar_attribute { @@ -34299,7 +34176,7 @@ index bcb201c..4fd34dd 100644 #define PSTORE_EFI_ATTRIBUTES \ (EFI_VARIABLE_NON_VOLATILE | \ -@@ -1734,7 +1734,7 @@ efivar_create_sysfs_entry(struct efivars *efivars, +@@ -1798,7 +1798,7 @@ efivar_create_sysfs_entry(struct efivars *efivars, static int create_efivars_bin_attributes(struct efivars *efivars) { @@ -34726,7 +34603,7 @@ index 8a7c48b..72effc2 100644 if (IS_GEN6(dev) || IS_GEN7(dev)) { seq_printf(m, diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c -index 99daa89..84ebd44 100644 +index 5206f24..7af0a0a 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1253,7 +1253,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev) @@ -34739,7 +34616,7 @@ index 99daa89..84ebd44 100644 return can_switch; } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 7339a4b..445aaba 100644 +index 66ad64f..a865871 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -656,7 +656,7 @@ typedef struct drm_i915_private { @@ -34751,7 +34628,7 @@ index 7339a4b..445aaba 100644 /* protects the irq masks */ spinlock_t irq_lock; -@@ -1102,7 +1102,7 @@ struct drm_i915_gem_object { +@@ -1103,7 +1103,7 @@ struct drm_i915_gem_object { * will be page flipped away on the next vblank. When it * reaches 0, dev_priv->pending_flip_queue will be woken up. */ @@ -34760,7 +34637,7 @@ index 7339a4b..445aaba 100644 }; #define to_gem_object(obj) (&((struct drm_i915_gem_object *)(obj))->base) -@@ -1633,7 +1633,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter( +@@ -1634,7 +1634,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter( struct drm_i915_private *dev_priv, unsigned port); extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit); @@ -34830,10 +34707,10 @@ index 3c59584..500f2e9 100644 return ret; diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index fe84338..a863190 100644 +index 3c00403..5a5c6c9 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -535,7 +535,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) +@@ -539,7 +539,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) u32 pipe_stats[I915_MAX_PIPES]; bool blc_event; @@ -34842,7 +34719,7 @@ index fe84338..a863190 100644 while (true) { iir = I915_READ(VLV_IIR); -@@ -688,7 +688,7 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg) +@@ -692,7 +692,7 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg) irqreturn_t ret = IRQ_NONE; int i; @@ -34851,7 +34728,7 @@ index fe84338..a863190 100644 /* disable master interrupt before clearing iir */ de_ier = I915_READ(DEIER); -@@ -760,7 +760,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) +@@ -764,7 +764,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) int ret = IRQ_NONE; u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir; @@ -34860,7 +34737,7 @@ index fe84338..a863190 100644 /* disable master interrupt before clearing iir */ de_ier = I915_READ(DEIER); -@@ -1787,7 +1787,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) +@@ -1791,7 +1791,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -34869,7 +34746,7 @@ index fe84338..a863190 100644 I915_WRITE(HWSTAM, 0xeffe); -@@ -1813,7 +1813,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev) +@@ -1817,7 +1817,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -34878,7 +34755,7 @@ index fe84338..a863190 100644 /* VLV magic */ I915_WRITE(VLV_IMR, 0); -@@ -2108,7 +2108,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev) +@@ -2112,7 +2112,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -34887,7 +34764,7 @@ index fe84338..a863190 100644 for_each_pipe(pipe) I915_WRITE(PIPESTAT(pipe), 0); -@@ -2159,7 +2159,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) +@@ -2163,7 +2163,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT; @@ -34896,7 +34773,7 @@ index fe84338..a863190 100644 iir = I915_READ16(IIR); if (iir == 0) -@@ -2244,7 +2244,7 @@ static void i915_irq_preinstall(struct drm_device * dev) +@@ -2248,7 +2248,7 @@ static void i915_irq_preinstall(struct drm_device * dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -34905,7 +34782,7 @@ index fe84338..a863190 100644 if (I915_HAS_HOTPLUG(dev)) { I915_WRITE(PORT_HOTPLUG_EN, 0); -@@ -2339,7 +2339,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) +@@ -2343,7 +2343,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) }; int pipe, ret = IRQ_NONE; @@ -34914,7 +34791,7 @@ index fe84338..a863190 100644 iir = I915_READ(IIR); do { -@@ -2465,7 +2465,7 @@ static void i965_irq_preinstall(struct drm_device * dev) +@@ -2469,7 +2469,7 @@ static void i965_irq_preinstall(struct drm_device * dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -34923,7 +34800,7 @@ index fe84338..a863190 100644 I915_WRITE(PORT_HOTPLUG_EN, 0); I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT)); -@@ -2572,7 +2572,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) +@@ -2576,7 +2576,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) int irq_received; int ret = IRQ_NONE, pipe; @@ -35931,7 +35808,7 @@ index 7d19b1b..8fdaaac 100644 BUG_ON(data->num_attributes >= data->max_attributes); \ sysfs_attr_init(&a->dev_attr.attr); \ diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c -index 1c85d39..55ed3cf 100644 +index 8047fed..1e956f0 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c @@ -169,7 +169,7 @@ struct sht15_data { @@ -37247,10 +37124,10 @@ index 7155945..4bcc562 100644 seq_printf(seq, "\n"); diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c -index 0666b5d..ed82cb4 100644 +index eee353d..74504c4 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c -@@ -1628,7 +1628,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param) +@@ -1632,7 +1632,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param) cmd == DM_LIST_VERSIONS_CMD) return 0; @@ -37260,7 +37137,7 @@ index 0666b5d..ed82cb4 100644 DMWARN("name not supplied when creating device"); return -EINVAL; diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c -index fa51918..c26253c 100644 +index 7f24190..0e18099 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c @@ -40,7 +40,7 @@ enum dm_raid1_error { @@ -37336,7 +37213,7 @@ index fa51918..c26253c 100644 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' : diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c -index c89cde8..9d184cf 100644 +index aaecefa..23b3026 100644 --- a/drivers/md/dm-stripe.c +++ b/drivers/md/dm-stripe.c @@ -20,7 +20,7 @@ struct stripe { @@ -37357,7 +37234,7 @@ index c89cde8..9d184cf 100644 } ti->private = sc; -@@ -325,7 +325,7 @@ static int stripe_status(struct dm_target *ti, status_type_t type, +@@ -325,7 +325,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type, DMEMIT("%d ", sc->stripes); for (i = 0; i < sc->stripes; i++) { DMEMIT("%s ", sc->stripe[i].dev->name); @@ -37366,7 +37243,7 @@ index c89cde8..9d184cf 100644 'D' : 'A'; } buffer[i] = '\0'; -@@ -371,8 +371,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error) +@@ -370,8 +370,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error) */ for (i = 0; i < sc->stripes; i++) if (!strcmp(sc->stripe[i].dev->name, major_minor)) { @@ -37413,7 +37290,7 @@ index 4d6e853..a234157 100644 pmd->bl_info.value_type.inc = data_block_inc; pmd->bl_info.value_type.dec = data_block_dec; diff --git a/drivers/md/dm.c b/drivers/md/dm.c -index 314a0e2..1376406 100644 +index 0d8f086..f5a91d5 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -170,9 +170,9 @@ struct mapped_device { @@ -37439,7 +37316,7 @@ index 314a0e2..1376406 100644 INIT_LIST_HEAD(&md->uevent_list); spin_lock_init(&md->uevent_lock); -@@ -2014,7 +2014,7 @@ static void event_callback(void *context) +@@ -2026,7 +2026,7 @@ static void event_callback(void *context) dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); @@ -37448,7 +37325,7 @@ index 314a0e2..1376406 100644 wake_up(&md->eventq); } -@@ -2669,18 +2669,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action, +@@ -2683,18 +2683,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action, uint32_t dm_next_uevent_seq(struct mapped_device *md) { @@ -37471,7 +37348,7 @@ index 314a0e2..1376406 100644 void dm_uevent_add(struct mapped_device *md, struct list_head *elist) diff --git a/drivers/md/md.c b/drivers/md/md.c -index 3db3d1b..9487468 100644 +index f363135..9b38815 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -240,10 +240,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio); @@ -37496,7 +37373,7 @@ index 3db3d1b..9487468 100644 wake_up(&md_event_waiters); } -@@ -1503,7 +1503,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ +@@ -1507,7 +1507,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) && (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET)) rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset); @@ -37505,7 +37382,7 @@ index 3db3d1b..9487468 100644 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256; bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1; -@@ -1747,7 +1747,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev) +@@ -1751,7 +1751,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev) else sb->resync_offset = cpu_to_le64(0); @@ -37514,7 +37391,7 @@ index 3db3d1b..9487468 100644 sb->raid_disks = cpu_to_le32(mddev->raid_disks); sb->size = cpu_to_le64(mddev->dev_sectors); -@@ -2747,7 +2747,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store); +@@ -2751,7 +2751,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store); static ssize_t errors_show(struct md_rdev *rdev, char *page) { @@ -37523,7 +37400,7 @@ index 3db3d1b..9487468 100644 } static ssize_t -@@ -2756,7 +2756,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len) +@@ -2760,7 +2760,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len) char *e; unsigned long n = simple_strtoul(buf, &e, 10); if (*buf && (*e == 0 || *e == '\n')) { @@ -37532,7 +37409,7 @@ index 3db3d1b..9487468 100644 return len; } return -EINVAL; -@@ -3203,8 +3203,8 @@ int md_rdev_init(struct md_rdev *rdev) +@@ -3210,8 +3210,8 @@ int md_rdev_init(struct md_rdev *rdev) rdev->sb_loaded = 0; rdev->bb_page = NULL; atomic_set(&rdev->nr_pending, 0); @@ -37543,7 +37420,7 @@ index 3db3d1b..9487468 100644 INIT_LIST_HEAD(&rdev->same_set); init_waitqueue_head(&rdev->blocked_wait); -@@ -6980,7 +6980,7 @@ static int md_seq_show(struct seq_file *seq, void *v) +@@ -6987,7 +6987,7 @@ static int md_seq_show(struct seq_file *seq, void *v) spin_unlock(&pers_lock); seq_printf(seq, "\n"); @@ -37552,7 +37429,7 @@ index 3db3d1b..9487468 100644 return 0; } if (v == (void*)2) { -@@ -7083,7 +7083,7 @@ static int md_seq_open(struct inode *inode, struct file *file) +@@ -7090,7 +7090,7 @@ static int md_seq_open(struct inode *inode, struct file *file) return error; seq = file->private_data; @@ -37561,7 +37438,7 @@ index 3db3d1b..9487468 100644 return error; } -@@ -7097,7 +7097,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait) +@@ -7104,7 +7104,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait) /* always allow read */ mask = POLLIN | POLLRDNORM; @@ -37570,7 +37447,7 @@ index 3db3d1b..9487468 100644 mask |= POLLERR | POLLPRI; return mask; } -@@ -7141,7 +7141,7 @@ static int is_mddev_idle(struct mddev *mddev, int init) +@@ -7148,7 +7148,7 @@ static int is_mddev_idle(struct mddev *mddev, int init) struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + (int)part_stat_read(&disk->part0, sectors[1]) - @@ -37621,10 +37498,10 @@ index 1cbfc6b..56e1dbb 100644 /*----------------------------------------------------------------*/ diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c -index d5bddfc..b079b4b 100644 +index 75b1f89..00ba344 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c -@@ -1818,7 +1818,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) +@@ -1819,7 +1819,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) if (r1_sync_page_io(rdev, sect, s, bio->bi_io_vec[idx].bv_page, READ) != 0) @@ -37633,7 +37510,7 @@ index d5bddfc..b079b4b 100644 } sectors -= s; sect += s; -@@ -2040,7 +2040,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, +@@ -2041,7 +2041,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, test_bit(In_sync, &rdev->flags)) { if (r1_sync_page_io(rdev, sect, s, conf->tmppage, READ)) { @@ -37643,10 +37520,10 @@ index d5bddfc..b079b4b 100644 "md/raid1:%s: read error corrected " "(%d sectors at %llu on %s)\n", diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c -index 64d4824..8b9ea57 100644 +index 8d925dc..11d674f 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c -@@ -1877,7 +1877,7 @@ static void end_sync_read(struct bio *bio, int error) +@@ -1878,7 +1878,7 @@ static void end_sync_read(struct bio *bio, int error) /* The write handler will notice the lack of * R10BIO_Uptodate and record any errors etc */ @@ -37655,7 +37532,7 @@ index 64d4824..8b9ea57 100644 &conf->mirrors[d].rdev->corrected_errors); /* for reconstruct, we always reschedule after a read. -@@ -2226,7 +2226,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) +@@ -2227,7 +2227,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) { struct timespec cur_time_mon; unsigned long hours_since_last; @@ -37664,7 +37541,7 @@ index 64d4824..8b9ea57 100644 ktime_get_ts(&cur_time_mon); -@@ -2248,9 +2248,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) +@@ -2249,9 +2249,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) * overflowing the shift of read_errors by hours_since_last. */ if (hours_since_last >= 8 * sizeof(read_errors)) @@ -37676,7 +37553,7 @@ index 64d4824..8b9ea57 100644 } static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector, -@@ -2304,8 +2304,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2305,8 +2305,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 return; check_decay_read_errors(mddev, rdev); @@ -37687,7 +37564,7 @@ index 64d4824..8b9ea57 100644 char b[BDEVNAME_SIZE]; bdevname(rdev->bdev, b); -@@ -2313,7 +2313,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2314,7 +2314,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 "md/raid10:%s: %s: Raid device exceeded " "read_error threshold [cur %d:max %d]\n", mdname(mddev), b, @@ -37696,7 +37573,7 @@ index 64d4824..8b9ea57 100644 printk(KERN_NOTICE "md/raid10:%s: %s: Failing raid device\n", mdname(mddev), b); -@@ -2468,7 +2468,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2469,7 +2469,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 sect + choose_data_offset(r10_bio, rdev)), bdevname(rdev->bdev, b)); @@ -40321,7 +40198,7 @@ index 2111dbb..79e434b 100644 /* disable hardware control by fn key */ result = ec_read(MSI_STANDARD_EC_SCM_LOAD_ADDRESS, &data); diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c -index b8ad71f..3ec9bb4 100644 +index 0fe987f..6f3d5c3 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -2356,7 +2356,7 @@ static void sony_nc_lid_resume_cleanup(struct platform_device *pd) @@ -43559,6 +43436,75 @@ index 35f10bf..6a38a0b 100644 if (!left--) { if (instance->disconnected) +diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c +index 5f0cb41..122d056 100644 +--- a/drivers/usb/class/cdc-wdm.c ++++ b/drivers/usb/class/cdc-wdm.c +@@ -56,6 +56,7 @@ MODULE_DEVICE_TABLE (usb, wdm_ids); + #define WDM_RESPONDING 7 + #define WDM_SUSPENDING 8 + #define WDM_RESETTING 9 ++#define WDM_OVERFLOW 10 + + #define WDM_MAX 16 + +@@ -155,6 +156,7 @@ static void wdm_in_callback(struct urb *urb) + { + struct wdm_device *desc = urb->context; + int status = urb->status; ++ int length = urb->actual_length; + + spin_lock(&desc->iuspin); + clear_bit(WDM_RESPONDING, &desc->flags); +@@ -185,9 +187,17 @@ static void wdm_in_callback(struct urb *urb) + } + + desc->rerr = status; +- desc->reslength = urb->actual_length; +- memmove(desc->ubuf + desc->length, desc->inbuf, desc->reslength); +- desc->length += desc->reslength; ++ if (length + desc->length > desc->wMaxCommand) { ++ /* The buffer would overflow */ ++ set_bit(WDM_OVERFLOW, &desc->flags); ++ } else { ++ /* we may already be in overflow */ ++ if (!test_bit(WDM_OVERFLOW, &desc->flags)) { ++ memmove(desc->ubuf + desc->length, desc->inbuf, length); ++ desc->length += length; ++ desc->reslength = length; ++ } ++ } + skip_error: + wake_up(&desc->wait); + +@@ -435,6 +445,11 @@ retry: + rv = -ENODEV; + goto err; + } ++ if (test_bit(WDM_OVERFLOW, &desc->flags)) { ++ clear_bit(WDM_OVERFLOW, &desc->flags); ++ rv = -ENOBUFS; ++ goto err; ++ } + i++; + if (file->f_flags & O_NONBLOCK) { + if (!test_bit(WDM_READ, &desc->flags)) { +@@ -478,6 +493,7 @@ retry: + spin_unlock_irq(&desc->iuspin); + goto retry; + } ++ + if (!desc->reslength) { /* zero length read */ + dev_dbg(&desc->intf->dev, "%s: zero length - clearing WDM_READ\n", __func__); + clear_bit(WDM_READ, &desc->flags); +@@ -1004,6 +1020,7 @@ static int wdm_post_reset(struct usb_interface *intf) + struct wdm_device *desc = wdm_find_device(intf); + int rv; + ++ clear_bit(WDM_OVERFLOW, &desc->flags); + clear_bit(WDM_RESETTING, &desc->flags); + rv = recover_from_urb_loss(desc); + mutex_unlock(&desc->wlock); diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c index cbacea9..246cccd 100644 --- a/drivers/usb/core/devices.c @@ -48388,10 +48334,10 @@ index eea5da7..88fead70 100644 WARN_ON(trans->transid != btrfs_header_generation(parent)); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c -index cc93b23..f3c42bf 100644 +index 659ea81..0f63c1a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c -@@ -7296,7 +7296,7 @@ fail: +@@ -7300,7 +7300,7 @@ fail: return -ENOMEM; } @@ -48400,7 +48346,7 @@ index cc93b23..f3c42bf 100644 struct dentry *dentry, struct kstat *stat) { struct inode *inode = dentry->d_inode; -@@ -7310,6 +7310,14 @@ static int btrfs_getattr(struct vfsmount *mnt, +@@ -7314,6 +7314,14 @@ static int btrfs_getattr(struct vfsmount *mnt, return 0; } @@ -48681,10 +48627,10 @@ index d9ea6ed..1e6c8ac 100644 server->ops->print_stats(m, tcon); } diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c -index de7f916..6cb22a9 100644 +index e328339..322228b 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c -@@ -997,7 +997,7 @@ cifs_init_request_bufs(void) +@@ -1002,7 +1002,7 @@ cifs_init_request_bufs(void) /* cERROR(1, "CIFSMaxBufSize %d 0x%x",CIFSMaxBufSize,CIFSMaxBufSize); */ cifs_req_cachep = kmem_cache_create("cifs_request", CIFSMaxBufSize + max_hdr_size, 0, @@ -48693,7 +48639,7 @@ index de7f916..6cb22a9 100644 if (cifs_req_cachep == NULL) return -ENOMEM; -@@ -1024,7 +1024,7 @@ cifs_init_request_bufs(void) +@@ -1029,7 +1029,7 @@ cifs_init_request_bufs(void) efficient to alloc 1 per page off the slab compared to 17K (5page) alloc of large cifs buffers even when page debugging is on */ cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq", @@ -48702,7 +48648,7 @@ index de7f916..6cb22a9 100644 NULL); if (cifs_sm_req_cachep == NULL) { mempool_destroy(cifs_req_poolp); -@@ -1109,8 +1109,8 @@ init_cifs(void) +@@ -1114,8 +1114,8 @@ init_cifs(void) atomic_set(&bufAllocCount, 0); atomic_set(&smBufAllocCount, 0); #ifdef CONFIG_CIFS_STATS2 @@ -48942,7 +48888,7 @@ index 47bc5a8..10decbe 100644 } diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c -index c9c7aa7..065056a 100644 +index bceffe7..cd1ae59 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -274,8 +274,8 @@ smb2_clear_stats(struct cifs_tcon *tcon) @@ -49126,7 +49072,7 @@ index 958ae0e..505c9d0 100644 return hit; diff --git a/fs/compat.c b/fs/compat.c -index 015e1e1..b8966ac 100644 +index a06dcbc..dacb6d3 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -54,7 +54,7 @@ @@ -49156,7 +49102,7 @@ index 015e1e1..b8966ac 100644 goto out; if (nr_segs > fast_segs) { ret = -ENOMEM; -@@ -831,6 +831,7 @@ struct compat_old_linux_dirent { +@@ -835,6 +835,7 @@ struct compat_old_linux_dirent { struct compat_readdir_callback { struct compat_old_linux_dirent __user *dirent; @@ -49164,7 +49110,7 @@ index 015e1e1..b8966ac 100644 int result; }; -@@ -848,6 +849,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, +@@ -852,6 +853,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, buf->result = -EOVERFLOW; return -EOVERFLOW; } @@ -49175,7 +49121,7 @@ index 015e1e1..b8966ac 100644 buf->result++; dirent = buf->dirent; if (!access_ok(VERIFY_WRITE, dirent, -@@ -878,6 +883,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd, +@@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd, buf.result = 0; buf.dirent = dirent; @@ -49183,7 +49129,7 @@ index 015e1e1..b8966ac 100644 error = vfs_readdir(f.file, compat_fillonedir, &buf); if (buf.result) -@@ -897,6 +903,7 @@ struct compat_linux_dirent { +@@ -901,6 +907,7 @@ struct compat_linux_dirent { struct compat_getdents_callback { struct compat_linux_dirent __user *current_dir; struct compat_linux_dirent __user *previous; @@ -49191,7 +49137,7 @@ index 015e1e1..b8966ac 100644 int count; int error; }; -@@ -918,6 +925,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen, +@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen, buf->error = -EOVERFLOW; return -EOVERFLOW; } @@ -49202,7 +49148,7 @@ index 015e1e1..b8966ac 100644 dirent = buf->previous; if (dirent) { if (__put_user(offset, &dirent->d_off)) -@@ -963,6 +974,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, +@@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, buf.previous = NULL; buf.count = count; buf.error = 0; @@ -49210,7 +49156,7 @@ index 015e1e1..b8966ac 100644 error = vfs_readdir(f.file, compat_filldir, &buf); if (error >= 0) -@@ -983,6 +995,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, +@@ -987,6 +999,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, struct compat_getdents_callback64 { struct linux_dirent64 __user *current_dir; struct linux_dirent64 __user *previous; @@ -49218,7 +49164,7 @@ index 015e1e1..b8966ac 100644 int count; int error; }; -@@ -999,6 +1012,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t +@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL; @@ -49229,7 +49175,7 @@ index 015e1e1..b8966ac 100644 dirent = buf->previous; if (dirent) { -@@ -1048,13 +1065,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd, +@@ -1052,13 +1069,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd, buf.previous = NULL; buf.count = count; buf.error = 0; @@ -50321,7 +50267,7 @@ index 22548f5..41521d8 100644 } return 1; diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c -index 2f2e0da..89b113a 100644 +index 92e68b3..115d987 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -505,8 +505,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi, @@ -50370,7 +50316,7 @@ index 8462eb3..4a71af6 100644 /* locality groups */ diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c -index 061727a..7622abf 100644 +index 28bbf9b..75ca7c1 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1747,7 +1747,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac, @@ -50487,7 +50433,7 @@ index 061727a..7622abf 100644 return 0; diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 0465f36..99a003a 100644 +index 5fa223d..12fa738 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2429,7 +2429,7 @@ struct ext4_attr { @@ -52391,7 +52337,7 @@ index a94e331..060bce3 100644 lock_flocks(); diff --git a/fs/namei.c b/fs/namei.c -index 43a97ee..4e585fd 100644 +index ec97aef..eedf4fe 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask) @@ -52445,7 +52391,7 @@ index 43a97ee..4e585fd 100644 return -EACCES; } -@@ -826,7 +834,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p) +@@ -824,7 +832,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p) { struct dentry *dentry = link->dentry; int error; @@ -52454,7 +52400,7 @@ index 43a97ee..4e585fd 100644 BUG_ON(nd->flags & LOOKUP_RCU); -@@ -847,6 +855,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p) +@@ -845,6 +853,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p) if (error) goto out_put_nd_path; @@ -52467,7 +52413,7 @@ index 43a97ee..4e585fd 100644 nd->last_type = LAST_BIND; *p = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(*p); -@@ -1596,6 +1610,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd) +@@ -1594,6 +1608,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd) break; res = walk_component(nd, path, &nd->last, nd->last_type, LOOKUP_FOLLOW); @@ -52476,7 +52422,7 @@ index 43a97ee..4e585fd 100644 put_link(nd, &link, cookie); } while (res > 0); -@@ -1694,7 +1710,7 @@ EXPORT_SYMBOL(full_name_hash); +@@ -1692,7 +1708,7 @@ EXPORT_SYMBOL(full_name_hash); static inline unsigned long hash_name(const char *name, unsigned int *hashp) { unsigned long a, b, adata, bdata, mask, hash, len; @@ -52485,7 +52431,7 @@ index 43a97ee..4e585fd 100644 hash = a = 0; len = -sizeof(unsigned long); -@@ -1979,6 +1995,8 @@ static int path_lookupat(int dfd, const char *name, +@@ -1977,6 +1993,8 @@ static int path_lookupat(int dfd, const char *name, if (err) break; err = lookup_last(nd, &path); @@ -52494,7 +52440,7 @@ index 43a97ee..4e585fd 100644 put_link(nd, &link, cookie); } } -@@ -1986,6 +2004,19 @@ static int path_lookupat(int dfd, const char *name, +@@ -1984,6 +2002,19 @@ static int path_lookupat(int dfd, const char *name, if (!err) err = complete_walk(nd); @@ -52514,7 +52460,7 @@ index 43a97ee..4e585fd 100644 if (!err && nd->flags & LOOKUP_DIRECTORY) { if (!nd->inode->i_op->lookup) { path_put(&nd->path); -@@ -2013,8 +2044,17 @@ static int filename_lookup(int dfd, struct filename *name, +@@ -2011,8 +2042,17 @@ static int filename_lookup(int dfd, struct filename *name, retval = path_lookupat(dfd, name->name, flags | LOOKUP_REVAL, nd); @@ -52533,7 +52479,7 @@ index 43a97ee..4e585fd 100644 return retval; } -@@ -2392,6 +2432,13 @@ static int may_open(struct path *path, int acc_mode, int flag) +@@ -2390,6 +2430,13 @@ static int may_open(struct path *path, int acc_mode, int flag) if (flag & O_NOATIME && !inode_owner_or_capable(inode)) return -EPERM; @@ -52547,7 +52493,7 @@ index 43a97ee..4e585fd 100644 return 0; } -@@ -2613,7 +2660,7 @@ looked_up: +@@ -2611,7 +2658,7 @@ looked_up: * cleared otherwise prior to returning. */ static int lookup_open(struct nameidata *nd, struct path *path, @@ -52556,7 +52502,7 @@ index 43a97ee..4e585fd 100644 const struct open_flags *op, bool got_write, int *opened) { -@@ -2648,6 +2695,17 @@ static int lookup_open(struct nameidata *nd, struct path *path, +@@ -2646,6 +2693,17 @@ static int lookup_open(struct nameidata *nd, struct path *path, /* Negative dentry, just create the file */ if (!dentry->d_inode && (op->open_flag & O_CREAT)) { umode_t mode = op->mode; @@ -52574,7 +52520,7 @@ index 43a97ee..4e585fd 100644 if (!IS_POSIXACL(dir->d_inode)) mode &= ~current_umask(); /* -@@ -2669,6 +2727,8 @@ static int lookup_open(struct nameidata *nd, struct path *path, +@@ -2667,6 +2725,8 @@ static int lookup_open(struct nameidata *nd, struct path *path, nd->flags & LOOKUP_EXCL); if (error) goto out_dput; @@ -52583,7 +52529,7 @@ index 43a97ee..4e585fd 100644 } out_no_open: path->dentry = dentry; -@@ -2683,7 +2743,7 @@ out_dput: +@@ -2681,7 +2741,7 @@ out_dput: /* * Handle the last step of open() */ @@ -52592,7 +52538,7 @@ index 43a97ee..4e585fd 100644 struct file *file, const struct open_flags *op, int *opened, struct filename *name) { -@@ -2712,16 +2772,44 @@ static int do_last(struct nameidata *nd, struct path *path, +@@ -2710,16 +2770,44 @@ static int do_last(struct nameidata *nd, struct path *path, error = complete_walk(nd); if (error) return error; @@ -52637,7 +52583,7 @@ index 43a97ee..4e585fd 100644 audit_inode(name, dir, 0); goto finish_open; } -@@ -2770,7 +2858,7 @@ retry_lookup: +@@ -2768,7 +2856,7 @@ retry_lookup: */ } mutex_lock(&dir->d_inode->i_mutex); @@ -52646,7 +52592,7 @@ index 43a97ee..4e585fd 100644 mutex_unlock(&dir->d_inode->i_mutex); if (error <= 0) { -@@ -2794,11 +2882,28 @@ retry_lookup: +@@ -2792,11 +2880,28 @@ retry_lookup: goto finish_open_created; } @@ -52676,7 +52622,7 @@ index 43a97ee..4e585fd 100644 /* * If atomic_open() acquired write access it is dropped now due to -@@ -2839,6 +2944,11 @@ finish_lookup: +@@ -2837,6 +2942,11 @@ finish_lookup: } } BUG_ON(inode != path->dentry->d_inode); @@ -52688,7 +52634,7 @@ index 43a97ee..4e585fd 100644 return 1; } -@@ -2848,7 +2958,6 @@ finish_lookup: +@@ -2846,7 +2956,6 @@ finish_lookup: save_parent.dentry = nd->path.dentry; save_parent.mnt = mntget(path->mnt); nd->path.dentry = path->dentry; @@ -52696,7 +52642,7 @@ index 43a97ee..4e585fd 100644 } nd->inode = inode; /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */ -@@ -2857,6 +2966,22 @@ finish_lookup: +@@ -2855,6 +2964,22 @@ finish_lookup: path_put(&save_parent); return error; } @@ -52719,7 +52665,7 @@ index 43a97ee..4e585fd 100644 error = -EISDIR; if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode)) goto out; -@@ -2955,7 +3080,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, +@@ -2953,7 +3078,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, if (unlikely(error)) goto out; @@ -52728,7 +52674,7 @@ index 43a97ee..4e585fd 100644 while (unlikely(error > 0)) { /* trailing symlink */ struct path link = path; void *cookie; -@@ -2973,7 +3098,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, +@@ -2971,7 +3096,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, error = follow_link(&link, nd, &cookie); if (unlikely(error)) break; @@ -52737,7 +52683,7 @@ index 43a97ee..4e585fd 100644 put_link(nd, &link, cookie); } out: -@@ -3073,8 +3198,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, +@@ -3071,8 +3196,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, goto unlock; error = -EEXIST; @@ -52751,7 +52697,7 @@ index 43a97ee..4e585fd 100644 /* * Special case - lookup gave negative, but... we had foo/bar/ * From the vfs_mknod() POV we just have a negative dentry - -@@ -3126,6 +3255,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, +@@ -3124,6 +3253,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, } EXPORT_SYMBOL(user_path_create); @@ -52772,7 +52718,7 @@ index 43a97ee..4e585fd 100644 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) { int error = may_create(dir, dentry); -@@ -3188,6 +3331,17 @@ retry: +@@ -3186,6 +3329,17 @@ retry: if (!IS_POSIXACL(path.dentry->d_inode)) mode &= ~current_umask(); @@ -52790,7 +52736,7 @@ index 43a97ee..4e585fd 100644 error = security_path_mknod(&path, dentry, mode, dev); if (error) goto out; -@@ -3204,6 +3358,8 @@ retry: +@@ -3202,6 +3356,8 @@ retry: break; } out: @@ -52799,7 +52745,7 @@ index 43a97ee..4e585fd 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3256,9 +3412,16 @@ retry: +@@ -3254,9 +3410,16 @@ retry: if (!IS_POSIXACL(path.dentry->d_inode)) mode &= ~current_umask(); @@ -52816,7 +52762,7 @@ index 43a97ee..4e585fd 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3339,6 +3502,8 @@ static long do_rmdir(int dfd, const char __user *pathname) +@@ -3337,6 +3500,8 @@ static long do_rmdir(int dfd, const char __user *pathname) struct filename *name; struct dentry *dentry; struct nameidata nd; @@ -52825,7 +52771,7 @@ index 43a97ee..4e585fd 100644 unsigned int lookup_flags = 0; retry: name = user_path_parent(dfd, pathname, &nd, lookup_flags); -@@ -3371,10 +3536,21 @@ retry: +@@ -3369,10 +3534,21 @@ retry: error = -ENOENT; goto exit3; } @@ -52847,7 +52793,7 @@ index 43a97ee..4e585fd 100644 exit3: dput(dentry); exit2: -@@ -3440,6 +3616,8 @@ static long do_unlinkat(int dfd, const char __user *pathname) +@@ -3438,6 +3614,8 @@ static long do_unlinkat(int dfd, const char __user *pathname) struct dentry *dentry; struct nameidata nd; struct inode *inode = NULL; @@ -52856,7 +52802,7 @@ index 43a97ee..4e585fd 100644 unsigned int lookup_flags = 0; retry: name = user_path_parent(dfd, pathname, &nd, lookup_flags); -@@ -3466,10 +3644,22 @@ retry: +@@ -3464,10 +3642,22 @@ retry: if (!inode) goto slashes; ihold(inode); @@ -52879,7 +52825,7 @@ index 43a97ee..4e585fd 100644 exit2: dput(dentry); } -@@ -3547,9 +3737,17 @@ retry: +@@ -3545,9 +3735,17 @@ retry: if (IS_ERR(dentry)) goto out_putname; @@ -52897,7 +52843,7 @@ index 43a97ee..4e585fd 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3623,6 +3821,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, +@@ -3621,6 +3819,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, { struct dentry *new_dentry; struct path old_path, new_path; @@ -52905,7 +52851,7 @@ index 43a97ee..4e585fd 100644 int how = 0; int error; -@@ -3646,7 +3845,7 @@ retry: +@@ -3644,7 +3843,7 @@ retry: if (error) return error; @@ -52914,7 +52860,7 @@ index 43a97ee..4e585fd 100644 (how & LOOKUP_REVAL)); error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) -@@ -3658,11 +3857,28 @@ retry: +@@ -3656,11 +3855,28 @@ retry: error = may_linkat(&old_path); if (unlikely(error)) goto out_dput; @@ -52943,7 +52889,7 @@ index 43a97ee..4e585fd 100644 done_path_create(&new_path, new_dentry); if (retry_estale(error, how)) { how |= LOOKUP_REVAL; -@@ -3908,12 +4124,21 @@ retry: +@@ -3906,12 +4122,21 @@ retry: if (new_dentry == trap) goto exit5; @@ -52965,7 +52911,7 @@ index 43a97ee..4e585fd 100644 exit5: dput(new_dentry); exit4: -@@ -3945,6 +4170,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna +@@ -3943,6 +4168,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link) { @@ -52974,7 +52920,7 @@ index 43a97ee..4e585fd 100644 int len; len = PTR_ERR(link); -@@ -3954,7 +4181,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c +@@ -3952,7 +4179,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c len = strlen(link); if (len > (unsigned) buflen) len = buflen; @@ -53564,7 +53510,7 @@ index 9b33c0c..2ffcca2 100644 } putname(tmp); diff --git a/fs/pipe.c b/fs/pipe.c -index bd3479d..fb92c4d 100644 +index 8e2e73f..1ef1048 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -438,9 +438,9 @@ redo: @@ -53659,7 +53605,7 @@ index bd3479d..fb92c4d 100644 } mutex_unlock(&inode->i_mutex); -@@ -868,9 +868,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp) +@@ -871,9 +871,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp) if (inode->i_pipe) { ret = 0; if (filp->f_mode & FMODE_READ) @@ -53671,7 +53617,7 @@ index bd3479d..fb92c4d 100644 } mutex_unlock(&inode->i_mutex); -@@ -962,7 +962,7 @@ void free_pipe_info(struct inode *inode) +@@ -965,7 +965,7 @@ void free_pipe_info(struct inode *inode) inode->i_pipe = NULL; } @@ -53680,7 +53626,7 @@ index bd3479d..fb92c4d 100644 /* * pipefs_dname() is called from d_path(). -@@ -992,7 +992,8 @@ static struct inode * get_pipe_inode(void) +@@ -995,7 +995,8 @@ static struct inode * get_pipe_inode(void) goto fail_iput; inode->i_pipe = pipe; @@ -72544,7 +72490,7 @@ index 71a3ca1..cc330ee 100644 if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) { diff --git a/ipc/msg.c b/ipc/msg.c -index 950572f..362ea07 100644 +index 31cd1bf..362ea07 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) @@ -72572,40 +72518,6 @@ index 950572f..362ea07 100644 msg_params.key = key; msg_params.flg = msgflg; -@@ -820,15 +821,17 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, - struct msg_msg *copy = NULL; - unsigned long copy_number = 0; - -+ ns = current->nsproxy->ipc_ns; -+ - if (msqid < 0 || (long) bufsz < 0) - return -EINVAL; - if (msgflg & MSG_COPY) { -- copy = prepare_copy(buf, bufsz, msgflg, &msgtyp, ©_number); -+ copy = prepare_copy(buf, min_t(size_t, bufsz, ns->msg_ctlmax), -+ msgflg, &msgtyp, ©_number); - if (IS_ERR(copy)) - return PTR_ERR(copy); - } - mode = convert_mode(&msgtyp, msgflg); -- ns = current->nsproxy->ipc_ns; - - msq = msg_lock_check(ns, msqid); - if (IS_ERR(msq)) { -diff --git a/ipc/msgutil.c b/ipc/msgutil.c -index ebfcbfa..5df8e4b 100644 ---- a/ipc/msgutil.c -+++ b/ipc/msgutil.c -@@ -117,9 +117,6 @@ struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst) - if (alen > DATALEN_MSG) - alen = DATALEN_MSG; - -- dst->next = NULL; -- dst->security = NULL; -- - memcpy(dst + 1, src + 1, alen); - - len -= alen; diff --git a/ipc/sem.c b/ipc/sem.c index 58d31f1..cce7a55 100644 --- a/ipc/sem.c @@ -73486,7 +73398,7 @@ index b4df219..f13c02d 100644 { struct signal_struct *sig = current->signal; diff --git a/kernel/fork.c b/kernel/fork.c -index c535f33..1d768f9 100644 +index 5630e52..0cee608 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -318,7 +318,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) @@ -73735,7 +73647,7 @@ index c535f33..1d768f9 100644 return 0; } -@@ -1193,6 +1243,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1196,6 +1246,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif retval = -EAGAIN; @@ -73745,7 +73657,7 @@ index c535f33..1d768f9 100644 if (atomic_read(&p->real_cred->user->processes) >= task_rlimit(p, RLIMIT_NPROC)) { if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -@@ -1432,6 +1485,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1435,6 +1488,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, goto bad_fork_free_pid; } @@ -73757,7 +73669,7 @@ index c535f33..1d768f9 100644 if (clone_flags & CLONE_THREAD) { current->signal->nr_threads++; atomic_inc(¤t->signal->live); -@@ -1515,6 +1573,8 @@ bad_fork_cleanup_count: +@@ -1518,6 +1576,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -73766,7 +73678,7 @@ index c535f33..1d768f9 100644 return ERR_PTR(retval); } -@@ -1565,6 +1625,23 @@ long do_fork(unsigned long clone_flags, +@@ -1568,6 +1628,23 @@ long do_fork(unsigned long clone_flags, return -EINVAL; } @@ -73790,7 +73702,7 @@ index c535f33..1d768f9 100644 /* * Determine whether and which event to report to ptracer. When * called from kernel_thread or CLONE_UNTRACED is explicitly -@@ -1599,6 +1676,8 @@ long do_fork(unsigned long clone_flags, +@@ -1602,6 +1679,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -73799,7 +73711,7 @@ index c535f33..1d768f9 100644 if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1752,7 +1831,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp) +@@ -1755,7 +1834,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp) return 0; /* don't need lock here; in the worst case we'll do useless copy */ @@ -73808,7 +73720,7 @@ index c535f33..1d768f9 100644 return 0; *new_fsp = copy_fs_struct(fs); -@@ -1866,7 +1945,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) +@@ -1869,7 +1948,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) fs = current->fs; spin_lock(&fs->lock); current->fs = new_fs; @@ -76758,7 +76670,7 @@ index 81fa536..6ccf96a 100644 int this_cpu = smp_processor_id(); struct rq *this_rq = cpu_rq(this_cpu); diff --git a/kernel/signal.c b/kernel/signal.c -index 3d09cf6..a67d2c6 100644 +index 3d09cf6..8988390 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -50,12 +50,12 @@ static struct kmem_cache *sigqueue_cachep; @@ -76795,7 +76707,17 @@ index 3d09cf6..a67d2c6 100644 if (override_rlimit || atomic_read(&user->sigpending) <= task_rlimit(t, RLIMIT_SIGPENDING)) { -@@ -492,7 +495,7 @@ flush_signal_handlers(struct task_struct *t, int force_default) +@@ -485,6 +488,9 @@ flush_signal_handlers(struct task_struct *t, int force_default) + if (force_default || ka->sa.sa_handler != SIG_IGN) + ka->sa.sa_handler = SIG_DFL; + ka->sa.sa_flags = 0; ++#ifdef SA_RESTORER ++ ka->sa.sa_restorer = NULL; ++#endif + sigemptyset(&ka->sa.sa_mask); + ka++; + } +@@ -492,7 +498,7 @@ flush_signal_handlers(struct task_struct *t, int force_default) int unhandled_signal(struct task_struct *tsk, int sig) { @@ -76804,7 +76726,7 @@ index 3d09cf6..a67d2c6 100644 if (is_global_init(tsk)) return 1; if (handler != SIG_IGN && handler != SIG_DFL) -@@ -812,6 +815,13 @@ static int check_kill_permission(int sig, struct siginfo *info, +@@ -812,6 +818,13 @@ static int check_kill_permission(int sig, struct siginfo *info, } } @@ -76818,7 +76740,7 @@ index 3d09cf6..a67d2c6 100644 return security_task_kill(t, info, sig, 0); } -@@ -1194,7 +1204,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) +@@ -1194,7 +1207,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) return send_signal(sig, info, p, 1); } @@ -76827,7 +76749,7 @@ index 3d09cf6..a67d2c6 100644 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) { return send_signal(sig, info, t, 0); -@@ -1231,6 +1241,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) +@@ -1231,6 +1244,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) unsigned long int flags; int ret, blocked, ignored; struct k_sigaction *action; @@ -76835,7 +76757,7 @@ index 3d09cf6..a67d2c6 100644 spin_lock_irqsave(&t->sighand->siglock, flags); action = &t->sighand->action[sig-1]; -@@ -1245,9 +1256,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) +@@ -1245,9 +1259,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) } if (action->sa.sa_handler == SIG_DFL) t->signal->flags &= ~SIGNAL_UNKILLABLE; @@ -76854,7 +76776,7 @@ index 3d09cf6..a67d2c6 100644 return ret; } -@@ -1314,8 +1334,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) +@@ -1314,8 +1337,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) ret = check_kill_permission(sig, info, p); rcu_read_unlock(); @@ -76867,7 +76789,7 @@ index 3d09cf6..a67d2c6 100644 return ret; } -@@ -2852,7 +2875,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info) +@@ -2852,7 +2878,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info) int error = -ESRCH; rcu_read_lock(); @@ -76884,7 +76806,7 @@ index 3d09cf6..a67d2c6 100644 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) { error = check_kill_permission(sig, info, p); /* -@@ -3135,8 +3166,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack, +@@ -3135,8 +3169,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack, } seg = get_fs(); set_fs(KERNEL_DS); @@ -78268,10 +78190,10 @@ index 33acb5e..57ebfd4 100644 .group = GLOBAL_ROOT_GID, .proc_inum = PROC_USER_INIT_INO, diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 2b042c4..24f8ec3 100644 +index dbfe36a7..6d36e9a 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c -@@ -78,7 +78,7 @@ int create_user_ns(struct cred *new) +@@ -79,7 +79,7 @@ int create_user_ns(struct cred *new) return ret; } @@ -78280,7 +78202,7 @@ index 2b042c4..24f8ec3 100644 /* Leave the new->user_ns reference with the new user namespace. */ ns->parent = parent_ns; ns->owner = owner; -@@ -104,15 +104,16 @@ int unshare_userns(unsigned long unshare_flags, struct cred **new_cred) +@@ -105,15 +105,16 @@ int unshare_userns(unsigned long unshare_flags, struct cred **new_cred) return create_user_ns(cred); } @@ -80037,7 +79959,7 @@ index bb1369f..efb96b5 100644 return 0; } diff --git a/mm/mempolicy.c b/mm/mempolicy.c -index e2df1c1..1e31d57 100644 +index 3df6d12..a11056a 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -721,6 +721,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, @@ -81910,7 +81832,7 @@ index 8c8e08f..73a5cda 100644 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c -index 926b466..b23df53 100644 +index fd26d04..0cea1b0 100644 --- a/mm/process_vm_access.c +++ b/mm/process_vm_access.c @@ -13,6 +13,7 @@ @@ -88669,7 +88591,7 @@ index 6b42d47..2ac24d5 100644 sub->evt.event = htohl(event, sub->swap); diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c -index 5b5c876..3127bf7 100644 +index 5b5c876..6713b81 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -786,6 +786,12 @@ static struct sock *unix_find_other(struct net *net, @@ -88718,6 +88640,34 @@ index 5b5c876..3127bf7 100644 done_path_create(&path, dentry); return err; } +@@ -2326,9 +2345,13 @@ static int unix_seq_show(struct seq_file *seq, void *v) + seq_puts(seq, "Num RefCount Protocol Flags Type St " + "Inode Path\n"); + else { +- struct sock *s = v; ++ struct sock *s = v, *peer; + struct unix_sock *u = unix_sk(s); + unix_state_lock(s); ++ peer = unix_peer(s); ++ unix_state_unlock(s); ++ ++ unix_state_double_lock(s, peer); + + seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu", + s, +@@ -2355,8 +2378,10 @@ static int unix_seq_show(struct seq_file *seq, void *v) + } + for ( ; i < len; i++) + seq_putc(seq, u->addr->name->sun_path[i]); +- } +- unix_state_unlock(s); ++ } else if (peer) ++ seq_printf(seq, " P%lu", sock_i_ino(peer)); ++ ++ unix_state_double_unlock(s, peer); + seq_putc(seq, '\n'); + } + diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 8800604..0526440 100644 --- a/net/unix/sysctl_net_unix.c @@ -90445,7 +90395,7 @@ index 55a6271..ad829c3 100644 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; diff --git a/security/keys/compat.c b/security/keys/compat.c -index 1c26176..64a1ba2 100644 +index d65fa7f..cbfe366 100644 --- a/security/keys/compat.c +++ b/security/keys/compat.c @@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov( @@ -90454,7 +90404,7 @@ index 1c26176..64a1ba2 100644 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid); + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid); - + err: if (iov != iovstack) kfree(iov); diff --git a/security/keys/key.c b/security/keys/key.c @@ -90578,19 +90528,6 @@ index 6ece7f2..ecdb55c 100644 goto error; buflen -= tmp; -diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c -index 58dfe08..c5ec083 100644 ---- a/security/keys/process_keys.c -+++ b/security/keys/process_keys.c -@@ -57,7 +57,7 @@ int install_user_keyrings(void) - - kenter("%p{%u}", user, uid); - -- if (user->uid_keyring) { -+ if (user->uid_keyring && user->session_keyring) { - kleave(" = 0 [exist]"); - return 0; - } diff --git a/security/min_addr.c b/security/min_addr.c index f728728..6457a0c 100644 --- a/security/min_addr.c diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index cd2cd898e5..8523336f47 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -654,7 +654,7 @@ CONFIG_XFRM_ALGO=m CONFIG_XFRM_USER=m CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y -# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_STATISTICS=y CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y @@ -2571,7 +2571,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y -# CONFIG_MOUSE_PS2_ELANTECH is not set +CONFIG_MOUSE_PS2_ELANTECH=y # CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m @@ -3774,6 +3774,7 @@ CONFIG_DVB_S5H1411=m # ISDB-T (terrestrial) frontends # CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m # # Digital terrestrial only tuners/PLL diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index 05e9586c7d..c4398fba69 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -628,7 +628,7 @@ CONFIG_XFRM_ALGO=m CONFIG_XFRM_USER=m CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y -# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_STATISTICS=y CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y @@ -2546,7 +2546,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y -# CONFIG_MOUSE_PS2_ELANTECH is not set +CONFIG_MOUSE_PS2_ELANTECH=y # CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m diff --git a/main/linux-grsec/usb-ehci-revert-remove-ass-pss-polling-timeout.patch b/main/linux-grsec/usb-ehci-revert-remove-ass-pss-polling-timeout.patch deleted file mode 100644 index 12adf16c4c..0000000000 --- a/main/linux-grsec/usb-ehci-revert-remove-ass-pss-polling-timeout.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 221f8dfca89276d8aec54c6d07fbe20c281668f0 Mon Sep 17 00:00:00 2001 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Tue, 26 Feb 2013 13:43:41 -0500 -Subject: USB: EHCI: revert "remove ASS/PSS polling timeout" - -From: Alan Stern <stern@rowland.harvard.edu> - -commit 221f8dfca89276d8aec54c6d07fbe20c281668f0 upstream. - -This patch (as1649) reverts commit -55bcdce8a8228223ec4d17d8ded8134ed265d2c5 (USB: EHCI: remove ASS/PSS -polling timeout). That commit was written under the assumption that -some controllers may take a very long time to turn off their async and -periodic schedules. It now appears that in fact the schedules do get -turned off reasonably quickly, but some controllers occasionally leave -the schedules' status bits turned on and consequently ehci-hcd can't -tell that the schedules are off. - -VIA controllers in particular have this problem. ehci-hcd tells the -hardware to turn off the async schedule, the schedule does get turned -off, but the status bit remains on. Since the EHCI spec requires that -the schedules not be re-enabled until the previous disable has taken -effect, with an unlimited timeout the async schedule never gets turned -back on. The resulting symptom is that the system is unable to -communicate with USB devices. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Reported-and-tested-by: Ronald <ronald645@gmail.com> -Reported-and-tested-by: Paul Hartman <paul.hartman@gmail.com> -Reported-and-tested-by: Dieter Nützel <dieter@nuetzel-hh.de> -Reported-and-tested-by: Jean Delvare <khali@linux-fr.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - drivers/usb/host/ehci-timer.c | 29 ++++++++++++++--------------- - 1 file changed, 14 insertions(+), 15 deletions(-) - ---- a/drivers/usb/host/ehci-timer.c -+++ b/drivers/usb/host/ehci-timer.c -@@ -113,15 +113,14 @@ static void ehci_poll_ASS(struct ehci_hc - - if (want != actual) { - -- /* Poll again later */ -- ehci_enable_event(ehci, EHCI_HRTIMER_POLL_ASS, true); -- ++ehci->ASS_poll_count; -- return; -+ /* Poll again later, but give up after about 20 ms */ -+ if (ehci->ASS_poll_count++ < 20) { -+ ehci_enable_event(ehci, EHCI_HRTIMER_POLL_ASS, true); -+ return; -+ } -+ ehci_dbg(ehci, "Waited too long for the async schedule status (%x/%x), giving up\n", -+ want, actual); - } -- -- if (ehci->ASS_poll_count > 20) -- ehci_dbg(ehci, "ASS poll count reached %d\n", -- ehci->ASS_poll_count); - ehci->ASS_poll_count = 0; - - /* The status is up-to-date; restart or stop the schedule as needed */ -@@ -160,14 +159,14 @@ static void ehci_poll_PSS(struct ehci_hc - - if (want != actual) { - -- /* Poll again later */ -- ehci_enable_event(ehci, EHCI_HRTIMER_POLL_PSS, true); -- return; -+ /* Poll again later, but give up after about 20 ms */ -+ if (ehci->PSS_poll_count++ < 20) { -+ ehci_enable_event(ehci, EHCI_HRTIMER_POLL_PSS, true); -+ return; -+ } -+ ehci_dbg(ehci, "Waited too long for the periodic schedule status (%x/%x), giving up\n", -+ want, actual); - } -- -- if (ehci->PSS_poll_count > 20) -- ehci_dbg(ehci, "PSS poll count reached %d\n", -- ehci->PSS_poll_count); - ehci->PSS_poll_count = 0; - - /* The status is up-to-date; restart or stop the schedule as needed */ diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index 65567b84a4..10f7469482 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=man-pages -pkgver=3.48 +pkgver=3.50 _posixver=2003-a pkgrel=0 pkgdesc="Linux man pages" @@ -31,9 +31,9 @@ package() { rm "$pkgdir"/usr/share/man/man3/iconv* } -md5sums="16cb409678ad97f936a452f47f806044 man-pages-3.48.tar.xz +md5sums="41a424a405e88f2e45137485c115b8c6 man-pages-3.50.tar.xz 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2" -sha256sums="6944cc3ad5131abab01c6703e63672b2e44be52737cdb1144f6ddaebb7f7d682 man-pages-3.48.tar.xz +sha256sums="5f2a67b457a80337801e8347040eaa24383898f5d39ef2664ec79713ff3fd611 man-pages-3.50.tar.xz e355b1b7bbccd4cef6b4a38dccf090e4535e038c21a9985c19891f21173d49ea man-pages-posix-2003-a.tar.bz2" -sha512sums="000d7ea7d6e628903b22eed83839246bd2a94221627ac2b4b0ba6af4bd75ea309f4e352ed1f4f997bce1b401ba55c47ca6e84af8fa64c6b143572d79e1d90edc man-pages-3.48.tar.xz +sha512sums="665c039f5952fbddc46bae70a0208a07c3e76a674edd9bd804b823462afb3f579605129ed1d8c62bc4e66b7c8c3fa591d2c3369c6f6fd603f19bb2388a8352c5 man-pages-3.50.tar.xz 70d1e1e5ceb3095323bfe2c85bfd5661e25fd77469a4b18eb9806f327cb65a030c2ea51185577d6230aec1778185ee2d4385f677af3069d28ab07e9373857024 man-pages-posix-2003-a.tar.bz2" diff --git a/main/minicom/APKBUILD b/main/minicom/APKBUILD index 75faf520a6..0573b468da 100644 --- a/main/minicom/APKBUILD +++ b/main/minicom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=minicom -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=0 pkgdesc="menu driven communications program for terminals" url="http://alioth.debian.org/projects/minicom" @@ -11,7 +11,7 @@ depends="" makedepends="ncurses-dev libiconv-dev gettext-dev" install="" subpackages="$pkgname-doc $pkgname-lang" -source="http://alioth.debian.org/frs/download.php/3700/minicom-2.6.1.tar.gz" +source="http://alioth.debian.org/frs/download.php/3869/minicom-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver build() { @@ -30,4 +30,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="435fb410a5bfa9bb20d4248b3ca53529 minicom-2.6.1.tar.gz" +md5sums="203c56c4b447f45e2301b0cc4e83da3c minicom-2.6.2.tar.gz" +sha256sums="f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168 minicom-2.6.2.tar.gz" +sha512sums="fa5d9de94707d6ab8cc647b35ab6ed00457abb85a2dd07e4853dd88381757d67c603e290f961bb24deb9a11ac0fc2e58cffcc67a6624571e3dd490cb3e4d04a7 minicom-2.6.2.tar.gz" diff --git a/main/mkinitfs/0001-init-fix-cryptdm-regression.patch b/main/mkinitfs/0001-init-fix-cryptdm-regression.patch new file mode 100644 index 0000000000..e989f2b7ed --- /dev/null +++ b/main/mkinitfs/0001-init-fix-cryptdm-regression.patch @@ -0,0 +1,28 @@ +From 17c2183fdd3f788fe38a64024d15c895492114b5 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 14 Mar 2013 07:09:32 +0000 +Subject: [PATCH] init: fix cryptdm regression + +--- + initramfs-init.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 3c05f81..9bce5f8 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -286,8 +286,9 @@ echo "Alpine Init $VERSION" + # acpi_osi="!Windows 2006" + eval set -- `cat /proc/cmdline` + +-myopts="alpine_dev autodetect autoraid chart cryptroot debug_init dma init_args +- keep_apk_new modules ovl_dev pkgs quiet root_size root usbdelay" ++myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm debug_init ++ dma init_args keep_apk_new modules ovl_dev pkgs quiet root_size root ++ usbdelay" + + for opt; do + case "$opt" in +-- +1.8.1.5 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index bd2c8f3dc9..a34187ce0a 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs pkgver=2.4.4 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + 0001-init-fix-cryptdm-regression.patch eglibc.patch " arch="noarch" @@ -43,8 +44,11 @@ package() { make install DESTDIR="$pkgdir" || return 1 } md5sums="5b897ab38204bf62ed8abf63d6b7cafd mkinitfs-2.4.4.tar.bz2 +88c6b7928cd7fd3bce1b7297083a3184 0001-init-fix-cryptdm-regression.patch 067649665a767ff1a08578e1f4e61524 eglibc.patch" sha256sums="454e43149322e9cdfd7ea397480621b42169b5d78dd8eab1be46b96762fc5dc5 mkinitfs-2.4.4.tar.bz2 +aa458c98f5099154bc0011355acb0ba3b718677d8775b7fd2d1dc71a92e3178b 0001-init-fix-cryptdm-regression.patch 2db513d1a058be0f5794dc74d00418807253d8ac850c9713ea0eeb0be5f3f65a eglibc.patch" sha512sums="9f0e49b20a592b4315155453e4398abf710c8bae62496d4b8d281e21d13366804084be26f0303d35ef3f0bf295eba76885ca43ff452d4aea1e59f0bdce0de18e mkinitfs-2.4.4.tar.bz2 +fe9122c5e00ba74476ade44f5e4e6b74690c10bd45cc239a5fab88468a3ee689b4880843aabe7a8efa9be2b6f0126dddbc94130d0b53866ee36138f3b3a96070 0001-init-fix-cryptdm-regression.patch 3498d9930889cd776a34863733d467b50b83679ea7f91d79963c81e4f1dc138f887ef1f2a696da6d836d1f6f862dcfd2c2fb9a55b0e3b2926e9f3fc648bc5a15 eglibc.patch" diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index 0d4a734f78..ba58dd4e3f 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -3,7 +3,7 @@ _flavor=grsec _kpkg=linux-$_flavor _realname=open-vm-tools -_kver=3.8.2 +_kver=3.8.3 _kpkgrel=0 _realver=9.2.2_p893683 diff --git a/main/owncloud/APKBUILD b/main/owncloud/APKBUILD index af842e6b81..8f33661f8c 100644 --- a/main/owncloud/APKBUILD +++ b/main/owncloud/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=owncloud -pkgver=4.5.7 +pkgver=5.0.0 pkgrel=1 pkgdesc="Your own WebDAV-based cloud service" url="http://owncloud.org" @@ -14,11 +14,10 @@ install="$pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-pgsql $pkgname-sqlite $pkgname-mysql $pkgname-texteditor $pkgname-videoviewer" replaces="$pkgname-plugins" -source="http://mirrors.owncloud.org/releases/$pkgname-$pkgver.tar.bz2 +source="http://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2 owncloud.config.php " - _builddir="$srcdir"/$pkgname prepare() { @@ -87,5 +86,5 @@ videoviewer() { } -md5sums="12b41fd8119c0fe48b62fcfe36999def owncloud-4.5.7.tar.bz2 -fd9403d34ddf737a3c932cfed0ff03b2 owncloud.config.php" +md5sums="a6786a4bc8f2efba3f4460f1f39fddb4 owncloud-5.0.0.tar.bz2 +48258b2f750ad85d3e1b1bc6d396a661 owncloud.config.php" diff --git a/main/owncloud/owncloud.config.php b/main/owncloud/owncloud.config.php index 7ea480b821..28b42d02f2 100644 --- a/main/owncloud/owncloud.config.php +++ b/main/owncloud/owncloud.config.php @@ -1,7 +1,7 @@ <?php $CONFIG = array( "datadirectory" => '/var/lib/owncloud/data', -"version" => '4.5.7', +"version" => '5.0.0', "dbname" => 'owncloud', "dbhost" => 'localhost', "dbuser" => 'owncloud', diff --git a/main/perl-email-address/APKBUILD b/main/perl-email-address/APKBUILD index ad737fed95..0c5cc93f5b 100644 --- a/main/perl-email-address/APKBUILD +++ b/main/perl-email-address/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-email-address -pkgver=1.896 +pkgver=1.898 pkgrel=0 pkgdesc="RFC 2822 Address Parsing and Creation" url="http://search.cpan.org/dist/Email-Address/" @@ -36,4 +36,6 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -md5sums="c9be7b64073bfb32d91248faa9fc3934 Email-Address-1.896.tar.gz" +md5sums="0ea27eae4888ec25733af68b51f20245 Email-Address-1.898.tar.gz" +sha256sums="7747c74f006cb1ad568ab38a5fe8f24184e633c64e74b12e41b0e60630d3ce0a Email-Address-1.898.tar.gz" +sha512sums="3d851ca500f448dfc0d36759fb43bc2c6413e668c9110ddad26273d02e6761800dc4ec90b0127504a96eaaf5c66a24cd090363b26d9a7cd81bf12a7cfe630232 Email-Address-1.898.tar.gz" diff --git a/main/perl-mime-tools/APKBUILD b/main/perl-mime-tools/APKBUILD index 016185faf6..c2c988c970 100644 --- a/main/perl-mime-tools/APKBUILD +++ b/main/perl-mime-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-mime-tools _realname=MIME-tools -pkgver=5.503 +pkgver=5.504 pkgrel=0 pkgdesc="Perl modules for parsing (and creating!) MIME entities" url="http://search.cpan.org/~doneill/MIME-tools-5.427/" @@ -28,4 +28,6 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="f86b968e9405318224b7a9f4574505d0 MIME-tools-5.503.tar.gz" +md5sums="8e055aab88552710377b4727b23bfb70 MIME-tools-5.504.tar.gz" +sha256sums="0f5819eecd59bd46874f741dfc452a0a172e59a7ac6c422ce69e10593f7693d2 MIME-tools-5.504.tar.gz" +sha512sums="0ff4d3991bc9e37edc39204051f7d9b9562a8afa23f768f0f653c554bf29c16ba315a043d63818c9e2ebc5f01a9f6961930dd8f4a1a501b5639bca36dde93c09 MIME-tools-5.504.tar.gz" diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD index 8eb19a59b2..a601022322 100644 --- a/main/pgpool/APKBUILD +++ b/main/pgpool/APKBUILD @@ -2,35 +2,40 @@ # Maintainer: Cameron <cbanta@gmail.com> pkgname=pgpool _opkgname=pgpool-II -pkgver=3.0.1 -pkgrel=2 -pkgdesc="Pgpool II is a connection pooling/replication server for PostgreSQL." -url="http://pgfoundry.org/projects/pgpool/" +pkgver=3.2.2 +pkgrel=0 +pkgdesc="A connection pooling/replication server for PostgreSQL" +url="http://www.pgpool.net" arch="all" license="BSD" makedepends="postgresql-dev" subpackages="$pkgname-doc $pkgname-dev" -source="http://pgfoundry.org/frs/download.php/2841/$_opkgname-$pkgver.tar.gz - $pkgname.initd" +source="$_opkgname-$pkgver.tar.gz::http://www.pgpool.net/download.php?f=$_opkgname-$pkgver.tar.gz + $pkgname.initd" +_builddir="$srcdir"/$_opkgname-$pkgver build() { - cd "$srcdir/$_opkgname-$pkgver" - - ./configure --prefix=/usr \ + cd "$_builddir" + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info - + --infodir=/usr/share/info \ + || return 1 make || return 1 } package() { - cd "$srcdir/$_opkgname-$pkgver" + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -md5sums="86d8beff0396d11b6753dd2be31bcad7 pgpool-II-3.0.1.tar.gz +md5sums="707f0f6328b669cb643b936c21365440 pgpool-II-3.2.2.tar.gz 6317aee51feaf9c5facb7765cddeec6b pgpool.initd" +sha256sums="307bab80dcefdcc5c1a2a7b2f294d5734d9c258985503e550b3cbf8d1858cfb0 pgpool-II-3.2.2.tar.gz +19c4652755913c53c209b0f6c81074a4ef430dd19a196fe22779f991a8cb8d66 pgpool.initd" +sha512sums="e02091ab5aa336d01e3a0d314b856868452880c4f86aa92e4f73105d4e9aa0c21914e18587f06a2f67282e30e3a50ffff0c0b3825efc5f91529de06206dbdfb8 pgpool-II-3.2.2.tar.gz +b8efd7b90e0bb74a5d099cd6929ea7a8342803dea4eed3410d210bfce4074a773a4f11caabb59dd4e85f049c5168537ebc504eb4d83236d2fa68b03725fa9aff pgpool.initd" diff --git a/main/pkgconf/APKBUILD b/main/pkgconf/APKBUILD index 03fc0ad17d..9781164b4f 100644 --- a/main/pkgconf/APKBUILD +++ b/main/pkgconf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=pkgconf -pkgver=0.8.12 +pkgver=0.9.0 pkgrel=0 pkgdesc="development framework configuration tools" url="https://github.com/pkgconf/pkgconf" @@ -12,7 +12,7 @@ depends_dev="" makedepends="$depends_dev" install="" replaces="pkgconfig" -source="http://tortois.es/~nenolod/distfiles/pkgconf-$pkgver.tar.bz2" +source="http://rabbit.dereferenced.org/~nenolod/distfiles/pkgconf-$pkgver.tar.bz2" _builddir="$srcdir"/pkgconf-$pkgver prepare() { @@ -44,6 +44,4 @@ package() { ln -s pkgconf "$pkgdir"/usr/bin/pkg-config } -md5sums="b614a2d7286b5eee9a998631040d9a63 pkgconf-0.8.12.tar.bz2" -sha256sums="307b954f15b66ab094db808fd2d2be9e56d6ffc12204866bea59eba1b0cb68f3 pkgconf-0.8.12.tar.bz2" -sha512sums="fa23b5da1ce597ee44ad8310cee5b2e7008d7df01dbaac80161ffe6378c671aca17f063af112e8c65043dfe8fbac8d4637ff64a2794b92af01bf1baf18009553 pkgconf-0.8.12.tar.bz2" +md5sums="9fd2b5f027c722db357f8604568ed314 pkgconf-0.9.0.tar.bz2" diff --git a/main/py-boto/APKBUILD b/main/py-boto/APKBUILD index e5e31b3b25..261b8c88bf 100644 --- a/main/py-boto/APKBUILD +++ b/main/py-boto/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matt Smith <mcs@darkregion.net> -# Maintainer: Matt Smith <mcs@darkregion.net> +# Maintainer: Matt Smith <mcs@darkregion.net> pkgname=py-boto _pkgname=boto -pkgver=2.4.1 +pkgver=2.8.0 pkgrel=0 pkgdesc="An interface to infrastructural services offered by Amazon Web Services" url="http://docs.pythonboto.org/en/latest/index.html" @@ -12,7 +12,7 @@ depends="python" makedepends="python-dev py-setuptools" install="" subpackages="$pkgname-doc" -source="https://github.com/downloads/$_pkgname/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$_pkgname-$pkgver prepare() { @@ -47,4 +47,6 @@ doc() { find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \; } -md5sums="6fb90c1aa8c8ce6d967f2b0e06deda5b boto-2.4.1.tar.gz" +md5sums="d86d23a357f4c527c51b1ea02bbae8e3 boto-2.8.0.tar.gz" +sha256sums="f520cec579a11c99b510e06d16f484ce877f5b75eeae850c7e165753092939db boto-2.8.0.tar.gz" +sha512sums="12853813ae78243ea025fb2e7d0d1dca71b655d977da5d9d28071f52a78708eebf16a42d8763b315246e7ebb681f5ec111e779d710286293175d38ac165a69f1 boto-2.8.0.tar.gz" diff --git a/main/py-configshell/APKBUILD b/main/py-configshell/APKBUILD index e504979c76..a5d9992d8a 100644 --- a/main/py-configshell/APKBUILD +++ b/main/py-configshell/APKBUILD @@ -14,7 +14,7 @@ depends_dev="python-dev py-simpleparse py-urwid" makedepends="$depends_dev" install="" subpackages="" -source="https://github.com/agrover/configshell-fb/archive/v$_ver.tar.gz" +source="$_realname-fb-$_ver.tar.gz::https://github.com/agrover/configshell-fb/archive/v$_ver.tar.gz" _builddir="$srcdir"/$_realname-fb-$_ver prepare() { @@ -37,6 +37,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="c14768baf1216f2ce272d7a9e261909c v1.1.fb7.tar.gz" -sha256sums="ab5576b7c4ff91390aea0b1edb7de5eada209da054022a10e8eab71252e2dc55 v1.1.fb7.tar.gz" -sha512sums="1fa8eed68c3bfa261dcb1ad7d724844bf1845f11fe8fa1587972e2cd6aa91750504e3438cc9b349c382b590bfe54e1ffbc616aa76927e32c4651123f6f756e37 v1.1.fb7.tar.gz" +md5sums="c14768baf1216f2ce272d7a9e261909c configshell-fb-1.1.fb7.tar.gz" +sha256sums="ab5576b7c4ff91390aea0b1edb7de5eada209da054022a10e8eab71252e2dc55 configshell-fb-1.1.fb7.tar.gz" +sha512sums="1fa8eed68c3bfa261dcb1ad7d724844bf1845f11fe8fa1587972e2cd6aa91750504e3438cc9b349c382b590bfe54e1ffbc616aa76927e32c4651123f6f756e37 configshell-fb-1.1.fb7.tar.gz" diff --git a/main/py-jinja2/APKBUILD b/main/py-jinja2/APKBUILD index ba82ec6a13..72470ba30f 100644 --- a/main/py-jinja2/APKBUILD +++ b/main/py-jinja2/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Matt Smith <mcs@darkregion.net> -# Maintainer: Matt Smith <mcs@darkregion.net> +# Maintainer: Matt Smith <mcs@darkregion.net> pkgname=py-jinja2 _pkgname=Jinja2 pkgver=2.6 pkgrel=0 -pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python." +pkgdesc="A small but fast and easy to use stand-alone python template engine" url="http://jinja.pocoo.org/" arch="noarch" license="BSD" depends="python" makedepends="python-dev py-setuptools" -install= +install="" subpackages="$pkgname-doc" source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$_pkgname-$pkgver - prepare() { cd "$_builddir" # apply patches here @@ -64,3 +63,5 @@ doc() { } md5sums="1c49a8825c993bfdcf55bb36897d28a2 Jinja2-2.6.tar.gz" +sha256sums="a85e185375db75c109f99ecde3d55415f035e7068a82252cf4f16c667ac38f49 Jinja2-2.6.tar.gz" +sha512sums="6603bd6a7e4956433746da15b18b1206b67c901262337aab8352ddff154efca9eb6d652c244c63e8ffad492d204c724db3e86222ae371e75e3f5f2011244554e Jinja2-2.6.tar.gz" diff --git a/main/py-parsing/APKBUILD b/main/py-parsing/APKBUILD index ec76e0aa23..962609b986 100644 --- a/main/py-parsing/APKBUILD +++ b/main/py-parsing/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=py-parsing -pkgver=1.5.6 +pkgver=1.5.7 pkgrel=0 pkgdesc="An object-oriented approach to text processing" url="http://pyparsing.wikispaces.com/" @@ -9,7 +9,7 @@ arch="noarch" license="MIT" depends="python" depends_dev="" -makedepends="$depends_dev" +makedepends="python-dev py-setuptools" install="" subpackages="" source="http://downloads.sourceforge.net/pyparsing/pyparsing-$pkgver.tar.gz" @@ -35,4 +35,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="1e41cb219dae9fc353bd4cd47636b283 pyparsing-1.5.6.tar.gz" +md5sums="b610eee4da882f0c9d063eaf83dc8fbf pyparsing-1.5.7.tar.gz" +sha256sums="2b3a013582cbff858e71ff23129e01acc5e99f511578d106ffb1e74bde15e893 pyparsing-1.5.7.tar.gz" +sha512sums="051efdc899b23981595c9661688b089bf973c45624099ebcbbe208e8e75bcbfacd0149b39ffda4d53622dd385f1c31751eed94a04239ba8baa2fceb0707c7207 pyparsing-1.5.7.tar.gz" diff --git a/main/py-pygments/APKBUILD b/main/py-pygments/APKBUILD index 09802290c6..79d942f87d 100644 --- a/main/py-pygments/APKBUILD +++ b/main/py-pygments/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matt Smith <mcs@darkregion.net> -# Maintainer: Matt Smith <mcs@darkregion.net> +# Maintainer: Matt Smith <mcs@darkregion.net> pkgname=py-pygments _pkgname=Pygments -pkgver=1.5 +pkgver=1.6 pkgrel=0 pkgdesc="A syntax highlighting package written in Python." url="http://pygments.org/" @@ -57,4 +57,6 @@ doc() { -exec chmod 755 '{}' \; || return 1 } -md5sums="ef997066cc9ee7a47d01fb4f3da0b5ff Pygments-1.5.tar.gz" +md5sums="a18feedf6ffd0b0cc8c8b0fbdb2027b1 Pygments-1.6.tar.gz" +sha256sums="799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0 Pygments-1.6.tar.gz" +sha512sums="552d0c2a1296773a5482122bd5cbec0ce91a497cd86ee105e1c5ddf2bfa9c206fcc7de504c6da480344c6e1bee30d7b26012fd061dcb2091d8b2b21bcd163bf0 Pygments-1.6.tar.gz" diff --git a/main/py-roman/APKBUILD b/main/py-roman/APKBUILD index 1c48cbed28..43280f1da4 100644 --- a/main/py-roman/APKBUILD +++ b/main/py-roman/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Matt Smith <mcs@darkregion.net> -# Maintainer: Matt Smith <mcs@darkregion.net> +# Maintainer: Matt Smith <mcs@darkregion.net> pkgname=py-roman _pkgname=roman -pkgver=1.4.0 -pkgrel=3 +pkgver=2.0.0 +pkgrel=0 pkgdesc="Integer to Roman numerals converter" url="http://pypi.python.org/pypi/roman" arch="noarch" license="Python2.1.1" depends="python" makedepends="python-dev py-setuptools" -install= -subpackages= -source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +install="" +subpackages="" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip" _builddir="$srcdir"/$_pkgname-$pkgver - prepare() { cd "$_builddir" # apply patches here @@ -31,4 +30,6 @@ package() { python setup.py install --root "$pkgdir" || return 1 } -md5sums="4f8832ed4108174b159c2afb4bd1d1dd roman-1.4.0.tar.gz" +md5sums="aa71d131eec16d45c030fd06a27c9d17 roman-2.0.0.zip" +sha256sums="90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae roman-2.0.0.zip" +sha512sums="d62a95e835232821dbf7a81d0c6b7df63f18c4116cfc7eee0c691a0b31d3d7b69d2dc2e4ea26e0a169a8e24bf080e8bb1e195b853be4adf1491335a5b4d5702c roman-2.0.0.zip" diff --git a/main/py-setuptools/APKBUILD b/main/py-setuptools/APKBUILD index 6f23307c14..490e15f5c2 100644 --- a/main/py-setuptools/APKBUILD +++ b/main/py-setuptools/APKBUILD @@ -4,27 +4,30 @@ pkgname=py-setuptools _pkgname=${pkgname#py-} pkgver=0.6c11 pkgrel=3 -pkgdesc="setuptools is a collection of enhancements to the Python distutils" +pkgdesc="A collection of enhancements to the Python distutils" url="http://pypi.python.org/pypi/setuptools" arch="noarch" license="PSF" depends="python" makedepends="python-dev" -install= +install="" subpackages="" -source="http://pypi.python.org/packages/source/s/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$srcdir"/$_pkgname-$pkgver + cd "$_builddir" python setup.py build || return 1 } package() { - cd "$srcdir"/$_pkgname-$pkgver - python setup.py install --root="$pkgdir" + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 # we don't provide a non-suffixed easy_install echo "Removing non-suffixed easy_install ( $pkgdir/usr/bin/easy_install)" rm "$pkgdir"/usr/bin/easy_install } md5sums="7df2a529a074f613b509fb44feefe74e setuptools-0.6c11.tar.gz" +sha256sums="630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3 setuptools-0.6c11.tar.gz" +sha512sums="5eaaa46af97fdf8ebca9b8768a8c6aa65e6c5028df44ccc141310989659f6e92069679ba160ac42eef9751cf89867a58035eac6cf4225a712bd0176fb685786e setuptools-0.6c11.tar.gz" diff --git a/main/py-sqlite/APKBUILD b/main/py-sqlite/APKBUILD index ee41216e6e..9dc1d91ce3 100644 --- a/main/py-sqlite/APKBUILD +++ b/main/py-sqlite/APKBUILD @@ -1,27 +1,29 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Maintainer: Mika Havela <mika.havela@gmail.com> pkgname=py-sqlite -_realname=pysqlite +_pkgname=pysqlite pkgver=2.6.3 pkgrel=2 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" url="http://code.google.com/p/pysqlite/" arch="all" license="MIT" -depends="python sqlite" -makedepends="sqlite-dev python-dev" -install= -source="http://pysqlite.googlecode.com/files/${_realname}-${pkgver}.tar.gz" - -_builddir="$srcdir"/$_realname-$pkgver +depends="sqlite" +makedepends="sqlite-dev python-dev py-setuptools" +install="" +source="http://pysqlite.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" +_builddir="$srcdir"/$_pkgname-$pkgver build() { - return 0 + cd "$_builddir" + python setup.py build || return 1 } package() { cd "$_builddir" - python setup.py install --root="$pkgdir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } md5sums="711afa1062a1d2c4a67acdf02a33d86e pysqlite-2.6.3.tar.gz" +sha256sums="0d538880717f6347bb83f9ce11e9b171caf9d76e1980a0e9c22f8b03aec3585b pysqlite-2.6.3.tar.gz" +sha512sums="fe7618b9b4b764a32be94dc8abd97445e33009c8489d2b417c9677382452a5c2d176feffe8b3167eb543f89d5ed3b9b717ceef63bfb2157b3f24a539cfb89a51 pysqlite-2.6.3.tar.gz" diff --git a/main/py-twisted-mail/APKBUILD b/main/py-twisted-mail/APKBUILD index 43cfc399bd..814712f307 100644 --- a/main/py-twisted-mail/APKBUILD +++ b/main/py-twisted-mail/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org> # Maintainer: - pkgname=py-twisted-mail _pkgname=TwistedMail -pkgver=12.0.0 +pkgver=12.3.0 pkgrel=0 pkgdesc="Python Twisted Mail library" url="http://twistedmatrix.com/trac/wiki/TwistedMail" @@ -11,12 +10,29 @@ arch="noarch" license="MIT" depends="py-twisted" makedepends="python-dev" -source="http://twistedmatrix.com/Releases/Mail/12.0/$_pkgname-$pkgver.tar.bz2" +source="http://twistedmatrix.com/Releases/Mail/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" + +_builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$_pkgname-$pkgver/ - python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + cd "$_builddir" + python setup.py build || return 1 +} +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="7c01bd6fecf5db26c241aa1c76d6567d TwistedMail-12.0.0.tar.bz2" +md5sums="c285ce7e7b2d8e606b3d35a26b025bad TwistedMail-12.3.0.tar.bz2" +sha256sums="339f04f9d49f9be2945086c7d1ffb530bcbc653ae0151d3fa0bd899ad82034b0 TwistedMail-12.3.0.tar.bz2" +sha512sums="9e6b5eaddfe7ec460b702a9c376c5c4e98cc2e5ea2b1c2bde87ddb93fd49eb9be1d489e7a2d3f56b1e281c79acb3a7a02a7e41268c0c2844e4aaf29fbce5e251 TwistedMail-12.3.0.tar.bz2" diff --git a/main/py-twisted-names/APKBUILD b/main/py-twisted-names/APKBUILD index bfc31f569f..16468a9e6d 100644 --- a/main/py-twisted-names/APKBUILD +++ b/main/py-twisted-names/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org> # Maintainer: - pkgname=py-twisted-names _pkgname=TwistedNames -pkgver=12.0.0 +pkgver=12.3.0 pkgrel=0 pkgdesc="Python Twisted Names DNS server and resolver library" url="http://twistedmatrix.com/trac/wiki/TwistedNames" @@ -11,12 +10,19 @@ arch="noarch" license="MIT" depends="py-twisted" makedepends="python-dev" -source="http://twistedmatrix.com/Releases/Names/12.0/$_pkgname-$pkgver.tar.bz2" +source="http://twistedmatrix.com/Releases/Names/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" +_builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$srcdir"/$_pkgname-$pkgver/ - python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + cd "$_builddir" + python setup.py build || return 1 +} +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="1e7b0f1c60d550712245455080f85115 TwistedNames-12.0.0.tar.bz2" +md5sums="946d0d16c06abac58479332cb8a9b006 TwistedNames-12.3.0.tar.bz2" +sha256sums="0e125aee9ef0025527cd30fb91ba6b520b237402629bfabdbb40148aec31156a TwistedNames-12.3.0.tar.bz2" +sha512sums="c77c99fabaa1d778852a4310207b452a17b2aa3c3241c250055a0f56b4eaf4aaa72c2e005318d10792f2b1c563568f28efda62fa5ff14b5a2b82c05ce4d58143 TwistedNames-12.3.0.tar.bz2" diff --git a/main/py-twisted-web/APKBUILD b/main/py-twisted-web/APKBUILD index a96c93ffa0..a4feedcb2a 100644 --- a/main/py-twisted-web/APKBUILD +++ b/main/py-twisted-web/APKBUILD @@ -1,6 +1,5 @@ # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org> # Maintainer: - pkgname=py-twisted-web _pkgname=TwistedWeb pkgver=12.0.0 @@ -11,12 +10,19 @@ arch="noarch" license="MIT" depends="py-twisted" makedepends="python-dev" -source="http://twistedmatrix.com/Releases/Web/12.0/$_pkgname-$pkgver.tar.bz2" +source="http://twistedmatrix.com/Releases/Web/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" +_builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$srcdir"/$_pkgname-$pkgver/ - python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + cd "$_builddir" + python setup.py build || return 1 +} +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } md5sums="e253566d86305bd1335874e69803d4f6 TwistedWeb-12.0.0.tar.bz2" +sha256sums="ff6d0dad12f1928deca23c8d05a0cb9a340abbb6e2cd8bc503e4092a0a873859 TwistedWeb-12.0.0.tar.bz2" +sha512sums="8a3e39989efa179e08ce4e15287fe0f12315b296fa7216d8444f6470e5860fb57e95c5173c30bdf1afa25304b411358ff1516069d486fd72559adfb89892b742 TwistedWeb-12.0.0.tar.bz2" diff --git a/main/py-twisted-words/APKBUILD b/main/py-twisted-words/APKBUILD index c687dcc7fa..60ba0d7b3d 100644 --- a/main/py-twisted-words/APKBUILD +++ b/main/py-twisted-words/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org> # Maintainer: - pkgname=py-twisted-words _pkgname=TwistedWords -pkgver=12.0.0 +pkgver=12.3.0 pkgrel=0 pkgdesc="Python Twisted Words library" url="http://twistedmatrix.com/trac/wiki/TwistedWords" @@ -11,12 +10,19 @@ arch="noarch" license="MIT" depends="py-twisted" makedepends="python-dev" -source="http://twistedmatrix.com/Releases/Words/12.0/$_pkgname-$pkgver.tar.bz2" +source="http://twistedmatrix.com/Releases/Words/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" +_builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$srcdir"/$_pkgname-$pkgver/ - python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + cd "$_builddir" + python setup.py build || return 1 +} +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="2d88f194022dcd243469460c86ad1b79 TwistedWords-12.0.0.tar.bz2" +md5sums="3146f62e2d4252aa781c4a2fbcae6ea9 TwistedWords-12.3.0.tar.bz2" +sha256sums="e6cd4f197aa698d95c80549d869a397299be2e69b148ac90c839b258b03c0980 TwistedWords-12.3.0.tar.bz2" +sha512sums="270638482e452ed6287818b129b5e22963a29325b5b60aa8b257509e4d4a359ff0f6fa0cacd666d263de52ea9c2a8b33802b2c6ec7f5d50258e961169a2aec69 TwistedWords-12.3.0.tar.bz2" diff --git a/main/py-twisted/APKBUILD b/main/py-twisted/APKBUILD index e8c18293c1..6dd562eef0 100644 --- a/main/py-twisted/APKBUILD +++ b/main/py-twisted/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=py-twisted _pkgname=Twisted -pkgver=12.0.0 +pkgver=12.3.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python." url="http://twistedmatrix.com/" @@ -30,4 +30,6 @@ package() { done } -md5sums="d231ae966799eedaab4c62e062e227e0 TwistedCore-12.0.0.tar.bz2" +md5sums="95e3fa899250003c74b8995154cc7421 TwistedCore-12.3.0.tar.bz2" +sha256sums="343dd7372b05d4aa0805406bcbee7db40514b6bb48aa2840e0e56d88a8970900 TwistedCore-12.3.0.tar.bz2" +sha512sums="86e9bbd4b8b0b5f70b62757f9ce93fd03c2766b4cb9722028ec7863d1b9dd19e6d3771472a86f1373a8320a98f5081ac76400ac6bb25a950b6fc50fb241ebeb8 TwistedCore-12.3.0.tar.bz2" diff --git a/main/py-urlgrabber/APKBUILD b/main/py-urlgrabber/APKBUILD index 3d812a5b8a..583b5012d6 100644 --- a/main/py-urlgrabber/APKBUILD +++ b/main/py-urlgrabber/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="python module for fetching files" url="http://urlgrabber.baseurl.org/" arch="noarch" -license="LGPL" +license="LGPL2+" depends="python py-curl" depends_dev="" makedepends="$depends_dev" diff --git a/main/py-urwid/APKBUILD b/main/py-urwid/APKBUILD index 6fb342198b..60c58e57e4 100644 --- a/main/py-urwid/APKBUILD +++ b/main/py-urwid/APKBUILD @@ -2,16 +2,16 @@ # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=py-urwid _pkgname=urwid -pkgver=1.0.1 +pkgver=1.1.1 pkgrel=0 -pkgdesc="Urwid is a console user interface library for Python" +pkgdesc="A console user interface library for Python" url="http://excess.org/urwid/" arch="all" license="LGPL2+" depends="" -makedepends="python-dev py-setuptools py-templayer" +makedepends="python-dev py-setuptools py-templayer py-sphinx" install="" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-examples" source="http://excess.org/$_pkgname/$_pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$_pkgname-$pkgver @@ -23,6 +23,7 @@ prepare() { build() { cd "$_builddir" python setup.py build || return 1 + sphinx-build -b html docs docs_tmp } package() { @@ -30,20 +31,20 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } +examples() { + arch="noarch" + # Put the examples into a seperate package + mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/examples || return 1 + mv "$_builddir"/examples "$subpkgdir"/usr/share/doc/"$pkgname"/examples || return 1 +} + doc() { + arch="noarch" cd "$_builddir" - - # generate tutorial examples, and copy documentation - python docgen_tutorial.py -s - mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/tutorial_examples - cp -a example*.py "$subpkgdir"/usr/share/doc/$pkgname/tutorial_examples/ - - for doc in CHANGELOG reference.html tutorial.html; do - install -Dm644 $doc "$subpkgdir"/usr/share/doc/$pkgname/$doc - done - - # Fix subdir perms - find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \; + mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1 + mv "$_builddir"/docs_tmp "$subpkgdir"/usr/share/doc/"$pkgname"/manual || return 1 } -md5sums="828f7144b94920205e755c249d2e297f urwid-1.0.1.tar.gz" +md5sums="eca2e0413cf7216b01c84b99e0f2576d urwid-1.1.1.tar.gz" +sha256sums="b301b4e0c2cd1634390cda80149d8aa2a07365af81a281ecf258770e47d30e99 urwid-1.1.1.tar.gz" +sha512sums="31a883998e1c91b46076a064b496c4c12fff972808d7d338b616251b29be2399caf5953ab8180d596f76260cd494f7ba09797886d637fce8d46cc1dfffe355ac urwid-1.1.1.tar.gz" diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index 50c3d51299..93b287e871 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,23 +1,21 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga -pkgver=0.99.21 -pkgrel=3 +pkgver=0.99.22 +pkgrel=0 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" arch="all" license="GPL-2" depends="iproute2" -makedepends="readline-dev ncurses-dev gawk texinfo - autoconf automake libtool" +makedepends="readline-dev ncurses-dev gawk texinfo perl" install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-dev $pkgname-doc" pkgusers="quagga" pkggroups="quagga" source="http://download.savannah.gnu.org/releases/quagga/quagga-$pkgver.tar.xz - $pkgname-0.99.11-link-libcap.patch $pkgname-0.99.11-del-routes.patch quagga-0.99.16-ipctl_forwarding.patch - automake.patch + texinfo.patch bgpd.initd ospf6d.initd ospfd.initd @@ -35,12 +33,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - - msg "Running autotools..." - aclocal || return 1 - autoconf || return 1 - automake --add-missing || return 1 - libtoolize || return 1 } build() { @@ -59,7 +51,8 @@ build() { --localstatedir=/var/run/quagga \ || return 1 - make || return 1 + # add CFLAGS to work around textrel issue + make CFLAGS+="-fPIC" || return 1 } package() { @@ -74,11 +67,10 @@ package() { install -Dm644 "$srcdir/zebra.confd" "$pkgdir"/etc/conf.d/zebra install -d -m755 "$pkgdir"/etc/quagga } -md5sums="0980758b1865b9aa0c60975120bf3453 quagga-0.99.21.tar.xz -8f99d41a8ed79e51704e8f655d255f29 quagga-0.99.11-link-libcap.patch +md5sums="0a8b01d01a1e02a7a6ec90a781fb774c quagga-0.99.22.tar.xz 1cbcf60a637b2577dee4d6df711e1247 quagga-0.99.11-del-routes.patch 2328ad4066584654cfc73f66d39dc267 quagga-0.99.16-ipctl_forwarding.patch -f29ce383b0a2d43a416b9cfa20943f05 automake.patch +93a7ca43d7637ce9b2624ad9adef7385 texinfo.patch ec7ac8cc1103f023cf5b9482b26ece59 bgpd.initd 92aba039c049050c48abf984c2db7e2b ospf6d.initd 878328ead225e6eb5f5f77f05ab39106 ospfd.initd @@ -86,3 +78,25 @@ ec7ac8cc1103f023cf5b9482b26ece59 bgpd.initd cda4115283d9f4a8304fec1b6881a7eb ripngd.initd 172e5b0e3f169e2b3328123e73517084 zebra.initd 34e06a1d2bc602ce691abc9ed169dd15 zebra.confd" +sha256sums="50336547ed53a03a3fa9130de5721fb916c40fef6652a1a36c9a71fdf338c75a quagga-0.99.22.tar.xz +11eee48e2954f1ac47e522dee8ca6e87f486abafccfe12ee5bd0f5845077ffc5 quagga-0.99.11-del-routes.patch +f06053e2a9030be80992bb7d4b18f4cfecd2d43cb09458557b6b8c1ac3fd22ca quagga-0.99.16-ipctl_forwarding.patch +d58c016b597e27bdcece897a9bfc66b611569ae2a7fbbc3740e30496c9365616 texinfo.patch +962afa79a0bcb781acc4c367ed55ccea2fbb927cf1271bc1fefaffcbb2f9389a bgpd.initd +f1017e7681692d99eab6f9842313be18104612055bcdab14dd7ac4ac1be38f53 ospf6d.initd +fed815e6530551f314297704e5491f5d2eeb16e930dcff6f12edc88a78b6023a ospfd.initd +36abd1158130a9268b6b852b7511a3457f8a17528f7d1b8a0b3f8ac41248a3c3 ripd.initd +565b6c0380a0010f464e37490468d58b9867bf6cfcbb36ac682a5e2760c40191 ripngd.initd +ca7c252cc1c79f05a55f933317d9a7f523dc6501bf5c72c553c43da4f8fd68dd zebra.initd +f7a52d383f60270a5a8fee5d4ac522c5c0ec2b7c4b5252cff54e260f32d9b323 zebra.confd" +sha512sums="580113cd9b68c1267cc737b98c64f15c8754c7ce2f9a23979b8beb03049ab81ac08feb4df38dbc46cfeeac79992bd6fa5e59a35c8f226945f752b873624718db quagga-0.99.22.tar.xz +34fda1c9ccb645a3df1ccc1947f87c4086f8aadeb9b53746bfd45f3562f6c1051964b45ec3a6f7e0eb1db46e424aae3daada49fea2582a62aeff71f78b885f4b quagga-0.99.11-del-routes.patch +1f4c45765bc1a8678ad1404bfab65799d9329e8f78a897b5c9c294d167745dd10d25304ba490988d9e94ae815c2c6f107b13efb3c710c44515470a61e2dd7c84 quagga-0.99.16-ipctl_forwarding.patch +31131f7bdf44ecc23831d857bc982864dc909a7f6da079675fc94d172692d025c656503af0591157f8cae88da4340dfc16072d7a9fd8456ea058d5b9d0d45f52 texinfo.patch +a865d9f5d2593270abc56dc65785317115337da00e8f389df3bf9af314052a4dc9e8f7af1142f7726637e06f1d8f7640cafd2a9e5ee8a7b4fd6b4e7b7c5bc784 bgpd.initd +f76aaacb1949a528a71a4bb69e9b6fa522c507000e8fa0cd60e0d80b8d2820155fa40fe7dedd86bdf38dc8029b1958c90bfbc8423afc737aae59248adba906b3 ospf6d.initd +fa3edb10d5b543c3f53a4dbd82edcda011be01f2d94b7b208cc02c1137a33adb703b734e7a4f22a51ec4d66203c44918dc9441be02b67248858b413146c61c16 ospfd.initd +95c96968133ed082a9e49661d1ea66fbeeb871d9bdd0dc5602953360e73ec2a83992c787f745211448629e3d90e69dc38a5fcae948825a7a73d3f2e4b8b91cc6 ripd.initd +6dbb662755ef84827768f2ed4779205e52b7eae50d377af5e4a951eb94317dbce3958184deb70dd3aa27f96d614e0be4d0fe2d871d961f4ffceaa84de454181c ripngd.initd +978a61e24ec9fc5558df550894f24cde4b729f88243e3f3d45394ec78009e22a87116c5a1dc4c382c7fa41e888155c8d901fc6028fba1cf9554349d4b432524e zebra.initd +900972c6f98e561dfacf384111251db262326e8764b8c763a5ef639fa11c7949c03eef5e3bce324a4b1964fe45416d2db74ae1b6bc967f7d4ba48c2eeda017c4 zebra.confd" diff --git a/main/quagga/automake.patch b/main/quagga/automake.patch deleted file mode 100644 index 7e10700c53..0000000000 --- a/main/quagga/automake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure.ac.orig 2012-12-31 21:49:07.571163898 +0000 -+++ ./configure.ac 2012-12-31 21:49:15.491232258 +0000 -@@ -19,7 +19,7 @@ - AC_CANONICAL_TARGET() - - AM_INIT_AUTOMAKE(1.6) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - AC_CHECK_PROG([GAWK],[gawk],[gawk],[not-in-PATH]) - if test "x$GAWK" = "xnot-in-PATH" ; then diff --git a/main/quagga/quagga-0.99.11-link-libcap.patch b/main/quagga/quagga-0.99.11-link-libcap.patch deleted file mode 100644 index 2c1b868d15..0000000000 --- a/main/quagga/quagga-0.99.11-link-libcap.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur quagga-0.99.11.orig/lib/Makefile.am quagga-0.99.11/lib/Makefile.am ---- quagga-0.99.11.orig/lib/Makefile.am 2008-09-24 15:22:43.000000000 +0000 -+++ quagga-0.99.11/lib/Makefile.am 2008-10-09 20:29:17.000000000 +0000 -@@ -18,7 +18,7 @@ - - libzebra_la_DEPENDENCIES = @LIB_REGEX@ - --libzebra_la_LIBADD = @LIB_REGEX@ -+libzebra_la_LIBADD = @LIB_REGEX@ @LIBCAP@ - - pkginclude_HEADERS = \ - buffer.h checksum.h command.h filter.h getopt.h hash.h \ -diff -ur quagga-0.99.11.orig/zebra/Makefile.am quagga-0.99.11/zebra/Makefile.am ---- quagga-0.99.11.orig/zebra/Makefile.am 2008-09-05 14:27:26.000000000 +0000 -+++ quagga-0.99.11/zebra/Makefile.am 2008-10-09 20:29:17.000000000 +0000 -@@ -39,7 +39,7 @@ - connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \ - interface.h ipforward.h irdp.h router-id.h kernel_socket.h - --zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la -+zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIBCAP) $(LIB_IPV6) - - testzebra_LDADD = $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la - diff --git a/main/quagga/texinfo.patch b/main/quagga/texinfo.patch new file mode 100644 index 0000000000..9f50687c69 --- /dev/null +++ b/main/quagga/texinfo.patch @@ -0,0 +1,13 @@ +--- ./doc/ipv6.texi.orig 2013-03-13 09:18:49.807751249 +0000 ++++ ./doc/ipv6.texi 2013-03-13 09:19:04.531223449 +0000 +@@ -136,8 +136,8 @@ + Default: 0 + @end deffn + +-+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} +-+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} ++@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} ++@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} + The value to be placed in Home Agent Option, when Home Agent config flag is set, + which indicates to hosts Home Agent Lifetime. The default value of 0 means to + place the current Router Lifetime value. diff --git a/main/scons/APKBUILD b/main/scons/APKBUILD index 1e0e6184c3..ad33f1f3fe 100644 --- a/main/scons/APKBUILD +++ b/main/scons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=scons -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=0 pkgdesc="scons software construction system" url="http://www.scons.org/" @@ -23,4 +23,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="f737f474a02d08156c821bd2d4d4b632 scons-2.2.0.tar.gz" +md5sums="083ce5624d6adcbdaf2526623f456ca9 scons-2.3.0.tar.gz" +sha256sums="9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b scons-2.3.0.tar.gz" +sha512sums="a7e88bb70b8b269337689fb4afd9563359f6ace37857bbd9824c9e40e43cac8b1e00468d8652bb9b46e410f6b161cb8c9006dd1fd9265756be153846a5e0fd65 scons-2.3.0.tar.gz" diff --git a/main/sg3_utils/APKBUILD b/main/sg3_utils/APKBUILD index d25c5ed1ad..cb396e4def 100644 --- a/main/sg3_utils/APKBUILD +++ b/main/sg3_utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter -# Maintainer: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sg3_utils -pkgver=1.33 +pkgver=1.35 pkgrel=0 pkgdesc="Generic SCSI utilities" url="http://sg.danny.cz/sg/sg3_utils.html" @@ -35,4 +35,6 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="261e39f7161337330ba6bd57999be801 sg3_utils-1.33.tgz" +md5sums="55c32fb95a5b3907687b023f392fbd3c sg3_utils-1.35.tgz" +sha256sums="385e73a3acc961efd50a610db9c737f14ccc98ba8488e54355be1f08417e08af sg3_utils-1.35.tgz" +sha512sums="b48ac056502959a5141a6699863d74f28d05d61704cfaa1cae5b55fcb7ec65f07032fc78741650274832ba4049d2abc5e091f7d9cf9e38d8a55175bd384cbbc8 sg3_utils-1.35.tgz" diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD index bf4b2d1388..e806c15b85 100644 --- a/main/squid/APKBUILD +++ b/main/squid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=squid -pkgver=3.3.2 +pkgver=3.3.3 pkgrel=0 pkgdesc="A full-featured Web proxy cache server." url="http://www.squid-cache.org" @@ -105,10 +105,24 @@ squid_kerb_auth() { mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/ } -md5sums="fedbad5be528bcf3e632538b11e0cc19 squid-3.3.2.tar.bz2 +md5sums="20f63ab34eae93b36969c9c7519f6462 squid-3.3.3.tar.bz2 16e3b38996d4c5858e1478f8eb650876 squid-3.2.0.16-loggable-urlgroup.patch c60237de253c02937f272d3b189d7679 cf_gen-pthread.patch 9e71076799d334faba6f4954594e7b4a bug-3679.patch 905e57c6d41414f54a75a5c0f9f7fac7 squid.initd 2897c725c201be53d3c9a7db0101bdf0 squid.confd 58823e0b86bc2dc71d270208b7b284b4 squid.logrotate" +sha256sums="563b218551a42901f5c9a8a0287cc4435608ac7ff7cd7882ca96a17bb8aef22b squid-3.3.3.tar.bz2 +9963c0f0ef96522d8cbb3379f119635d2b4df0796589211d91f6705935a835d5 squid-3.2.0.16-loggable-urlgroup.patch +0dce1d6216918856a11de7f37adc39e9b3f645c03c6350f0a5b6dc8f3aef38b9 cf_gen-pthread.patch +6b08cd129ea5fef019c78f1818c628e1070fe767e362da14844396b671f5a18d bug-3679.patch +3e5786304f218aecd5c01fa4b81aa05092ee3c7652d914b01112222fb5b2796e squid.initd +ec2a9f3308129354783c5088fb37148eda102fe9397fb7bbe90243d9223ee2e1 squid.confd +b6efdb3261c2e4b5074ef49160af8b96e65f934c7fd64b8954df48aa41cd9b67 squid.logrotate" +sha512sums="f03786c71cd6ddbdafa5d67bbcbf25dc43f6b723049427569c427bfc39bec404fac54819707c098c11a246e012ba611828f496f2834847d15ab63840d0160465 squid-3.3.3.tar.bz2 +1ab18ed43225fcca95f6c2e1554524bfee805f4894d5342acbdcd9faa6dcad5f310ed4ea01c9131f9729197e27399649b62a95666cb4564e30d8b0904f0f1b75 squid-3.2.0.16-loggable-urlgroup.patch +b148364e21293f7723ad5d7ccc2989d34ca6fb778d6383c45ae6b64450aa8495fdbe70f265f01be270511a042c230de95d26c9425f37d941083e44cc6e6e1603 cf_gen-pthread.patch +b477397f205ba207502a42aae674c85cad85eec831158ea0834361d98ef09a0f103d7a847e101bdd0ece73bbdda9b545960edd5385042bd593733810977e292a bug-3679.patch +d16178aef007bafa976b89def4371fdd05f26c5ab558f6619bf6f6ca915fc783d2314d7d8e96032abfaf7b3f8c8b746031f78a6be1f66245d9303ff3a9feb605 squid.initd +f13b3ab159fdc7cdcccfe10e494a84fa2d67c999820e166a8ad67523094088c147d3712b00e9cfd0d6b7e3c0cc9a4ad3ee7d7f7d42e11f5b5c4b5e4bf5016b31 squid.confd +89a703fa4f21b6c7c26e64a46fd52407e20f00c34146ade0bea0c4b63d050117c0f8e218f2256a1fbf6abb84f4ec9b0472c9a4092ff6e78f07c4f5a25d0892a5 squid.logrotate" diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD index 467484840c..8d31f932c8 100644 --- a/main/sysstat/APKBUILD +++ b/main/sysstat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sysstat -pkgver=10.1.3 +pkgver=10.1.4 pkgrel=0 pkgdesc="Performance monitoring tools for Linux" url="http://pagesperso-orange.fr/sebastien.godard/" @@ -28,4 +28,6 @@ package() { } -md5sums="e08b5665956930ad12b10ed6e0a08b10 sysstat-10.1.3.tar.gz" +md5sums="0a8e9f69c66fc6737e6645e22eed3275 sysstat-10.1.4.tar.gz" +sha256sums="7a39a923dbb4c50752a5b8227f4e76fbfea2b2545bd7faf9c168a5dc8e031dc9 sysstat-10.1.4.tar.gz" +sha512sums="309c9bd46940c6ce465cdbec51c080d6789b4ebd72798a2a191fe75b75ced144785389c142b47f67faa1cbb51e10f1be4abd31a935597b7e8128ccfab73e7ecc sysstat-10.1.4.tar.gz" diff --git a/main/texinfo/APKBUILD b/main/texinfo/APKBUILD index f5ebb67440..debd990c3b 100644 --- a/main/texinfo/APKBUILD +++ b/main/texinfo/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=texinfo -pkgver=5.0 +pkgver=5.1 pkgrel=0 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" url="http://www.gnu.org/software/texinfo/" @@ -25,6 +25,6 @@ package() { gzip ${pkgdir}/usr/share/info/* } -md5sums="918432285abe6fe96c98355594c5656a texinfo-5.0.tar.gz" -sha256sums="2c579345a39a2a0bb4b8c28533f0b61356504a202da6a25d17d4d866af7f5803 texinfo-5.0.tar.gz" -sha512sums="27822169cef9c8e727f8510ef234246f16f3ed7abfe268ade9b7fbc927dc78ed7dcc726850220a022c1537514d9bf934c514b7ca6663b63ad345f148fe83c6d4 texinfo-5.0.tar.gz" +md5sums="54e250014fe698fb4832016158747c03 texinfo-5.1.tar.gz" +sha256sums="50e8067f9758bb2bf175b69600082ac4a27c464cb4bcd48a578edd3127216600 texinfo-5.1.tar.gz" +sha512sums="ddbe6703bae95db5ec720d1add1fc5b5f5e780341ede4d5e559007ea89d7c2f932fb5707aa7365b30ea015d8a47773ff01b1858f0089d9afc11c7fe48e5ecd80 texinfo-5.1.tar.gz" diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD index b968321198..85b2e8089a 100644 --- a/main/tzdata/APKBUILD +++ b/main/tzdata/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tzdata -pkgver=2012j +pkgver=2013b _tzcodever=2011i _ptzver=0.3 -pkgrel=1 +pkgrel=0 pkgdesc="Timezone data" url="http://www.twinsun.com/tz/tz-link.htm" arch="all" @@ -56,7 +56,17 @@ package() { } md5sums="cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz -ba2f92ae7ad099090e8f86cff2f2d799 tzdata2012j.tar.gz +489dbca77d1f2e287a3987ca047bb246 tzdata2013b.tar.gz 99efce32b3f870e1b071ce47f3a98a18 posixtz-0.3.tar.bz2 -b12fcd52ddda1d4de16655e0c52a3675 Makefile.patch +c5bb94e9a3605485069c027373f68689 Makefile.patch 0b4d86d855f7daa3f79c9f28f04a48f9 0001-posixtz-fix-up-lseek.patch" +sha256sums="f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec tzcode2011i.tar.gz +70d589d0e76a3749403d2bb404e9214c2520dda4c13e4b07b1b945ed2c64edb2 tzdata2013b.tar.gz +574a765e0569458d7ccb76e97b3a96de2f0c19ad093c6811675b8a57f7088a53 posixtz-0.3.tar.bz2 +9f7c97a7c7a0c325b2d3797bfcd60d03540f08b5b437c8146a0171258741e018 Makefile.patch +e0b6de6a3d389f96dc95e5b75c2ada9afc63858e3770a0f07a62e1e56a77561e 0001-posixtz-fix-up-lseek.patch" +sha512sums="4febb158d9799cb9a7017259d76b74d54d0a8f9dfb46443fa79701f488964080b1d64d81eec38c11fcb85aecf31f42bf42437d77575537c598c37a6569765696 tzcode2011i.tar.gz +12374cba6f97ede4c005aea8118fae43258c54cbb6fc9b5a9357342c6e34de9b5d48761a1768e1125e27f537bf0b13ae70fd5c9107dcbcb0af92695f953deead tzdata2013b.tar.gz +57dfd38a4050230e49ec9a23bfec5e995dd48ed1fa338a72c4d2c3b86590d4c7357d3dc6d12b4f1564beebcf48f0d0ed855574e4ba29268160d8f84928a477fd posixtz-0.3.tar.bz2 +2000e0381978957dd80e1b6b930932acb3f0397fe682fc194818848b14a2872242f96b98c24b8ab8b8af0e57ccf3a541ab1de4b2f114e6a15d22ed71a19331a3 Makefile.patch +c7ddb4eecf8e55e6153f641d478a3affa2522e093e94e95e2ee43039a5c6eed28dcc472bcaa3a7c7c1b84747744c25028467e0048765ef0fc75b89345fc29318 0001-posixtz-fix-up-lseek.patch" diff --git a/main/tzdata/Makefile.patch b/main/tzdata/Makefile.patch index 9044162948..9caefcbfbf 100644 --- a/main/tzdata/Makefile.patch +++ b/main/tzdata/Makefile.patch @@ -1,7 +1,6 @@ -diff -Naur src/Makefile src-p/Makefile ---- src/Makefile 2007-08-20 16:47:41.000000000 +0200 -+++ src-p/Makefile 2007-10-02 04:07:44.000000000 +0200 -@@ -34,17 +34,17 @@ +--- ./Makefile.orig 2013-02-27 17:20:35.000000000 +0000 ++++ ./Makefile 2013-03-13 15:03:39.518555524 +0000 +@@ -45,17 +45,17 @@ # Everything gets put in subdirectories of. . . @@ -22,7 +21,7 @@ diff -Naur src/Makefile src-p/Makefile # If you "make INSTALL", the "date" command gets installed in. . . -@@ -52,7 +52,7 @@ +@@ -63,7 +63,7 @@ # Manual pages go in subdirectories of. . . @@ -31,7 +30,7 @@ diff -Naur src/Makefile src-p/Makefile # Library functions are put in an archive in LIBDIR. -@@ -83,7 +83,7 @@ +@@ -94,7 +94,7 @@ # Non-default libraries needed to link. # Add -lintl if you want to use `gettext' on Solaris. @@ -39,17 +38,17 @@ diff -Naur src/Makefile src-p/Makefile +LDLIBS=$(LDFLAGS) # Add the following to the end of the "CFLAGS=" line as needed. - # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) -@@ -211,7 +211,7 @@ + # -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?) +@@ -228,7 +228,7 @@ # before the first Monday in January when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. -CFLAGS= +CFLAGS += -std=gnu99 - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s -@@ -241,8 +241,10 @@ + # Linker flags. Default to $(LFLAGS) for backwards compatibility + # to tzcode2012h and earlier. +@@ -289,8 +289,10 @@ ############################################################################### @@ -62,7 +61,7 @@ diff -Naur src/Makefile src-p/Makefile TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -282,14 +284,16 @@ +@@ -331,14 +333,16 @@ ALL: all date @@ -83,7 +82,7 @@ diff -Naur src/Makefile src-p/Makefile $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 -rm -f $(MANDIR)/man3/newctime.3 \ $(MANDIR)/man3/newtzset.3 \ -@@ -298,13 +302,11 @@ +@@ -347,13 +351,11 @@ $(MANDIR)/man8/zdump.8 \ $(MANDIR)/man8/zic.8 cp newctime.3 newtzset.3 $(MANDIR)/man3/. @@ -99,7 +98,7 @@ diff -Naur src/Makefile src-p/Makefile -rm -f $(MANDIR)/man1/date.1 cp date.1 $(MANDIR)/man1/. -@@ -334,9 +336,9 @@ +@@ -388,9 +390,9 @@ # You must replace all of $(TZDIR) to switch from not using leap seconds # to using them, or vice versa. other_two: zic leapseconds $(TDATA) @@ -111,21 +110,12 @@ diff -Naur src/Makefile src-p/Makefile posix_right: posix_only other_two -@@ -367,7 +369,7 @@ +@@ -418,7 +420,7 @@ <$? >$@ chmod +x $@ --check: check_tables check_web -+check: check_tables - - check_tables: checktab.awk $(PRIMARY_YDATA) - $(AWK) -f checktab.awk $(PRIMARY_YDATA) -diff -Naur src/tzselect.ksh src-p/tzselect.ksh ---- src/tzselect.ksh 2007-08-20 16:47:42.000000000 +0200 -+++ src-p/tzselect.ksh 2007-10-02 04:07:44.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /bin/ksh -+#! /bin/bash - - # '@(#)tzselect.ksh 8.1' +-check: check_character_set check_tables check_web ++check: check_character_set check_tables + check_character_set: $(ENCHILADA) + sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA) diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index 742cfaa160..938c6257df 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -4,7 +4,7 @@ _kpkg=linux-$_flavor _realname=xtables-addons _name=$_realname-$_flavor -_kver=3.8.2 +_kver=3.8.3 _kpkgrel=0 _realver=2.1 diff --git a/testing/fakechroot/APKBUILD b/testing/fakechroot/APKBUILD index bba493cf67..0ce2bc759a 100644 --- a/testing/fakechroot/APKBUILD +++ b/testing/fakechroot/APKBUILD @@ -12,7 +12,7 @@ depends_dev="" makedepends="$depends_dev autoconf automake libtool" install="" subpackages="$pkgname-doc" -source="fakechroot-$pkgver.tar.gz::https://github.com/fakechroot/fakechroot/archive/${pkgver}.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/fakechroot/fakechroot/archive/${pkgver}.tar.gz" _builddir="${srcdir}/$pkgname-${pkgver}" prepare() { diff --git a/testing/openvpn-ad-check/APKBUILD b/testing/openvpn-ad-check/APKBUILD index 8b3792ec76..a92f2dbafe 100644 --- a/testing/openvpn-ad-check/APKBUILD +++ b/testing/openvpn-ad-check/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Alan Messias Cordeiro de Lacerda (alacerda) <alancordeiro@gmail.com> # Maintainer: Alan Messias Cordeiro de Lacerda (alacerda) <alancordeiro@gmail.com> pkgname=openvpn-ad-check -pkgver=1 +pkgver=1.1 pkgrel=0 pkgdesc="Authenticate OpenVPN users against AD server and verify if they are member of a specific group." url="https://sourceforge.net/p/openvpnadcheck" -arch="all" +arch="noarch" license="GPL" depends="openvpn lua-ldap" depends_dev="" makedepends="$depends_dev" install="" subpackages="" -source="http://sourceforge.net/projects/openvpnadcheck/files/openvpnadcheck.tgz" +source="http://sourceforge.net/projects/openvpnadcheck/files/$pkgname-$pkgver.tgz" _builddir="$srcdir/$pkgname" prepare() { @@ -36,4 +36,4 @@ package() { chmod 644 "$pkgdir"/etc/openvpn/openvpnadcheck.conf } -md5sums="50517d06d4c2f4078cb64afae414060c openvpnadcheck.tgz" +md5sums="a4a21c72d12ac53d289aac6bfbd986ab openvpn-ad-check-1.1.tgz" diff --git a/testing/protobuf/APKBUILD b/testing/protobuf/APKBUILD index f00f134b2d..1a9d9a737d 100644 --- a/testing/protobuf/APKBUILD +++ b/testing/protobuf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=protobuf -pkgver=2.4.1 +pkgver=2.5.0 pkgrel=0 pkgdesc="Library for extensible, efficient structure packing" url="http://code.google.com/p/protobuf/" @@ -12,9 +12,9 @@ depends_dev="zlib-dev" makedepends="$depends_dev" install="" subpackages="$pkgname-dev" -source="http://protobuf.googlecode.com/files/protobuf-$pkgver.tar.bz2" +source="http://protobuf.googlecode.com/files/$pkgname-$pkgver.tar.bz2" -_builddir="$srcdir"/protobuf-$pkgver +_builddir="$srcdir"/$pkgname-$pkgver prepare() { local i cd "$_builddir" @@ -50,4 +50,6 @@ py() { install -m644 google "$subpkgdir"/usr/lib/python2.6/site-packages } -md5sums="ed436802019c9e1f40cc750eaf78f318 protobuf-2.4.1.tar.bz2" +md5sums="a72001a9067a4c2c4e0e836d0f92ece4 protobuf-2.5.0.tar.bz2" +sha256sums="13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" +sha512sums="5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee protobuf-2.5.0.tar.bz2" diff --git a/testing/psmisc/APKBUILD b/testing/psmisc/APKBUILD index 79d6eee7be..49ab428edd 100644 --- a/testing/psmisc/APKBUILD +++ b/testing/psmisc/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=psmisc -pkgver=22.14 +pkgver=22.20 pkgrel=0 -pkgdesc="a set of some small useful utilities that use the proc filesystem" +pkgdesc="A set of some small useful utilities that use the proc filesystem" url="http://psmisc.sourceforge.net/" arch="all" license="BSD GPL" -depends= +depends="" makedepends="ncurses-dev" -install= +install="" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/psmisc/psmisc-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver - prepare() { cd "$_builddir" # apply patches here @@ -24,13 +23,16 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info + --infodir=/usr/share/info \ + || return 1 make || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install || return 1 } -md5sums="ba3f4e971895c92bba7770d81c981503 psmisc-22.14.tar.gz" +md5sums="a25fc99a6dc7fa7ae6e4549be80b401f psmisc-22.20.tar.gz" +sha256sums="b17224e2385f6a799ffebba27eb7870771d42555e86814ef56b6d7e955765514 psmisc-22.20.tar.gz" +sha512sums="5565163651c90afeb146c3305fddefc544bcd4cd5e98917fd57a9920e76c22e4bc0a197618539475a1410cfec9dd168b69983b2210a3ad9fc54368e9220503a6 psmisc-22.20.tar.gz" diff --git a/testing/py-apache-libcloud/APKBUILD b/testing/py-apache-libcloud/APKBUILD index 29b69e2147..f24d67dca8 100644 --- a/testing/py-apache-libcloud/APKBUILD +++ b/testing/py-apache-libcloud/APKBUILD @@ -2,29 +2,30 @@ # Maintainer: pkgname=py-apache-libcloud _pkgname=apache-libcloud -pkgver=0.11.4 +pkgver=0.12.1 pkgrel=0 -pkgdesc="Apache Libcloud is a standard Python library that abstracts away differences among multiple cloud provider APIs" +pkgdesc="A Python library that abstracts away differences among multiple cloud provider APIs" url="https://libcloud.apache.org" arch="noarch" -license="APACHE" +license="Apache2" depends="" -depends_dev="python-dev" -makedepends="$depends_dev" +depends_dev="" +makedepends="python-dev py-setuptools" install="" subpackages="" source="http://www.mirrorservice.org/sites/ftp.apache.org/libcloud/$_pkgname-$pkgver.tar.bz2" + _builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" - python setup.py build + python setup.py build || return 1 } package() { cd "$_builddir" - python setup.py install --root="$pkgdir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="94b4bebbe500cf4747623e9503213a4a apache-libcloud-0.11.4.tar.bz2" -sha256sums="5987f20c256608ee757b1a097b6392afbd18058cfc21ce761c078b44da95c532 apache-libcloud-0.11.4.tar.bz2" -sha512sums="b761e6b1d29f60c382602b552c48268f1cf0a27e2a51bdf6603179f085a160b10c51eaa2d089bc868ae2147dc246ada43d0142edf03a786de20ef3468e23db1e apache-libcloud-0.11.4.tar.bz2" +md5sums="293bcae58ed98e354756ef2166b5d281 apache-libcloud-0.12.1.tar.bz2" +sha256sums="26cc9e13d627a58c78894e6982125ffb8418b94ab5854694e4c2f844bf1a2ca3 apache-libcloud-0.12.1.tar.bz2" +sha512sums="fcb0555bf078bf3cf548d7903f8dc7d2d49b9aa08e00c36ccb3e1da710e3f3a1885a5db7612ceaeb658e1b126214342c0fde678b90e7052490ff0412e360d024 apache-libcloud-0.12.1.tar.bz2" diff --git a/testing/py-application/APKBUILD b/testing/py-application/APKBUILD index 2135f154ff..c480240811 100644 --- a/testing/py-application/APKBUILD +++ b/testing/py-application/APKBUILD @@ -1,22 +1,29 @@ # Contributor: Francesco Colista <francesco.colista@gmail.com> # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=py-application -_name=python-application -pkgver=1.2.7 +_pkgname=python-application +pkgver=1.4.0 pkgrel=1 pkgdesc="Basic building blocks for python applications" url="http://pypi.python.org/pypi/python-application" -arch="all" -license="PSF" +arch="noarch" +license="LGPL2+" depends="python" -makedepends="python-dev" -install= +makedepends="python-dev py-setuptools" +install="" subpackages="" -source="http://pypi.python.org/packages/source/p/python-application/python-application-$pkgver.tar.gz" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$srcdir"/$_name-$pkgver - mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages - python setup.py install --root="$pkgdir" - echo "/usr/lib/python2.6/site-packages/$_name-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_name.pth + cd "$_builddir" + python setup.py build || return 1 } -md5sums="07b32e25d931c5e591278848f3fc9f20 python-application-1.2.7.tar.gz" + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} +md5sums="2c1ec745f512ffd5892b0dd415074834 python-application-1.4.0.tar.gz" +sha256sums="0ed5cb64385c335b7b30093931d7965fec2c459f6f630c493491285e33378ea6 python-application-1.4.0.tar.gz" +sha512sums="e97dc05381df68ff643501a7018b2f8ec350c80392080e7420f52b9db3b85148f304388fcf4fd085771e34bfe1e5bef7965f0210370657f194eed2f5ba06950f python-application-1.4.0.tar.gz" diff --git a/testing/py-cjson/APKBUILD b/testing/py-cjson/APKBUILD index b11f796f52..2c1313a7b4 100644 --- a/testing/py-cjson/APKBUILD +++ b/testing/py-cjson/APKBUILD @@ -1,25 +1,30 @@ # Contributor: Francesco Colista <francesco.colista@gmail.com> # Maintainer: Francesco Colista <francesco.colista@gmail.com> - pkgname=py-cjson -_name=python-cjson +_pkgname=python-cjson pkgver=1.0.5 pkgrel=2 pkgdesc="Fast JSON encoder/decoder for Python" -url="http://pypi.python.org/pypi/python-gnutls" +url="https://pypi.python.org/pypi/python-cjson" arch="all" -license="PSF" -depends="python" -makedepends="python-dev" -install= +license="LGPL2+" +depends="" +makedepends="python-dev py-setuptools" +install="" subpackages="" -source="http://pypi.python.org/packages/source/p/python-cjson/$_name-$pkgver.tar.gz" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$srcdir"/$_name-$pkgver - mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages - python setup.py install --root="$pkgdir" - echo "/usr/lib/python2.6/site-packages/$_name-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_name.pth + cd "$_builddir" + python setup.py build || return 1 +} +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } md5sums="4d55b66ecdf0300313af9d030d9644a3 python-cjson-1.0.5.tar.gz" +sha256sums="85bbe7a9fb6617e24bb4dbef528af8ef6eae07f8809dcd05ec926142feca7714 python-cjson-1.0.5.tar.gz" +sha512sums="ba47337df70e27a9d44daa96c1d4f8d1a846193486ad78279e29ae7016bb2adb9146c0926fb99c7312c6fe9fea63b6cf947ef2a8faea376e27e004bdd55fb0ed python-cjson-1.0.5.tar.gz" diff --git a/testing/py-django/APKBUILD b/testing/py-django/APKBUILD index acdc18d265..0d5af7d7d9 100644 --- a/testing/py-django/APKBUILD +++ b/testing/py-django/APKBUILD @@ -2,28 +2,30 @@ # Maintainer: pkgname=py-django _pkgname=Django -pkgver=1.4.1 +pkgver=1.5 pkgrel=0 -pkgdesc="A high-level Python Web framework that encourages rapid development and clean, pragmatic design." +pkgdesc="A high-level Python Web framework" url="http://djangoproject.com/" arch="noarch" -license="bsd" -depends=python -depends_dev=python-dev -makedepends="$depends_dev" +license="BSD" +depends="python" +depends_dev="" +makedepends="python-dev" install="" subpackages="" source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$_builddir" - python setup.py build + cd "$_builddir" + python setup.py build || return 1 } package() { - cd "$_builddir" - python setup.py install --root "$pkgdir" + cd "$_builddir" + python setup.py install --root "$pkgdir" || return 1 } -md5sums="e345268dacff12876ae4e45de0a61b7d Django-1.4.1.tar.gz" +md5sums="fac09e1e0f11bb83bb187d652a9be967 Django-1.5.tar.gz" +sha256sums="078bf8f8ab025ed79e41ed5cee145a64dffea638eb5c2928c8cd106720824416 Django-1.5.tar.gz" +sha512sums="be2150b9c654bd4995af9acee70b49cefc18bd70f57dd1761e270202726374f2e4b0b6722bc39e03da110702ad2281bc098dc1ac89fa4c61849d882bf8f18786 Django-1.5.tar.gz" diff --git a/testing/py-eventlet/APKBUILD b/testing/py-eventlet/APKBUILD index aaacadaae8..6f46eea4b4 100644 --- a/testing/py-eventlet/APKBUILD +++ b/testing/py-eventlet/APKBUILD @@ -1,25 +1,28 @@ # Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net> # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net> pkgname=py-eventlet -pkgver=0.9.16 -pkgrel=1 +_pkgname=eventlet +pkgver=0.12.0 +pkgrel=0 pkgdesc="Python library for seamless coroutine-based concurrency" url="http://eventlet.net/" arch="noarch" license="MIT" depends="python py-greenlet" makedepends="python-dev py-setuptools" -source="http://pypi.python.org/packages/source/e/eventlet/eventlet-${pkgver}.tar.gz" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/eventlet-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver build () { cd "$_builddir" - python setup.py build + python setup.py build || return 1 } package() { cd "$_builddir" - python setup.py install --root="$pkgdir" + python setup.py install --root "$pkgdir" || return 1 } -md5sums="4728e3bd7f72763c1e5dccac0296f8ea eventlet-0.9.16.tar.gz" +md5sums="6cfd34f287f78d64a3c5c43c66c4bd33 eventlet-0.12.0.tar.gz" +sha256sums="157316a57f5ff28825564f5b2463ce9e2827726f466613d5e5d639bc5aedfb86 eventlet-0.12.0.tar.gz" +sha512sums="1c9f9dad59f3aed228b553c0310cf15c78066a52cc0cda7ea3e35d0d19c9a1d1992e3e0717755402e46c091e81d9cc200cf60093dffb480cf5d4aac4bc16837d eventlet-0.12.0.tar.gz" diff --git a/testing/py-greenlet/APKBUILD b/testing/py-greenlet/APKBUILD index 2be1c61155..0cf668ddfb 100644 --- a/testing/py-greenlet/APKBUILD +++ b/testing/py-greenlet/APKBUILD @@ -1,25 +1,29 @@ # Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net> # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net> pkgname=py-greenlet -pkgver=0.3.1 -pkgrel=1 +_pkgname=greenlet +pkgver=0.4.0 +pkgrel=0 pkgdesc="Lightweight in-process concurrent programming" url="http://pypi.python.org/pypi/greenlet" arch="all" license="MIT" -depends="python" +depends="" makedepends="python-dev py-setuptools" -source="http://pypi.python.org/packages/source/g/greenlet/greenlet-$pkgver.tar.gz" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip" -_builddir="$srcdir"/greenlet-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver build () { cd "$_builddir" - python setup.py build + python setup.py build || return 1 } package() { cd "$_builddir" - python setup.py install --root="$pkgdir" + python setup.py install --root="$pkgdir" || return 1 } -md5sums="8d75d7f3f659e915e286e1b0fa0e1c4d greenlet-0.3.1.tar.gz" + +md5sums="87887570082caadc08fb1f8671dbed71 greenlet-0.4.0.zip" +sha256sums="3f52af03bf8a89045fc159c6a76d5642349b30fb41c3df1a22b12bbd3920b1ee greenlet-0.4.0.zip" +sha512sums="c072ceb83b3040448f0f7c8596aa134837fcc2ada5513b12fbeada4f5ae2ca5e4d4c5814c317a9270e4a0a65a02e2525dce7edad678978782013da7caa188d19 greenlet-0.4.0.zip" diff --git a/testing/py-lxml/APKBUILD b/testing/py-lxml/APKBUILD index 22027ba92b..d3e50f06b7 100644 --- a/testing/py-lxml/APKBUILD +++ b/testing/py-lxml/APKBUILD @@ -5,7 +5,7 @@ _pkgname=lxml pkgver=3.1.0 pkgrel=0 pkgdesc="Python LXML Library" -url="http://codespeak.net/lxml" +url="http://lxml.de/" arch="all" license="BSD" depends="" diff --git a/testing/py-mysql2pgsql/APKBUILD b/testing/py-mysql2pgsql/APKBUILD new file mode 100644 index 0000000000..406d015ef9 --- /dev/null +++ b/testing/py-mysql2pgsql/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-mysql2pgsql +pkgver=0.1.5 +pkgrel=0 +pkgdesc="A migrating/converting tool from mysql to postgresql" +url="https://github.com/philipsoutham/py-mysql2pgsql" +arch="noarch" +license="MIT" +depends="python py-yaml py-psycopg2 py-mysqldb" +depends_dev="" +makedepends="python-dev py-setuptools" +install="" +subpackages="" +source="http://pypi.python.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="f9383fc558dff6f6c1e304465ff702da py-mysql2pgsql-0.1.5.tar.gz" +sha256sums="024d3f1d3994679421102a2cb70c1fde1306bdf8c70839db907a728324c65cdf py-mysql2pgsql-0.1.5.tar.gz" +sha512sums="291f754f6bdd186c7e61e3046af346c86edc514c52a1b3d081b7d5c335e911271be011af4abfc8442cdab54838408a10f0dd6a53d75f629f64fc6ffd9b140ab1 py-mysql2pgsql-0.1.5.tar.gz" diff --git a/testing/py-paramiko/APKBUILD b/testing/py-paramiko/APKBUILD index c09e6f2e14..c851936bf1 100644 --- a/testing/py-paramiko/APKBUILD +++ b/testing/py-paramiko/APKBUILD @@ -2,23 +2,24 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-paramiko _pkgname=paramiko -pkgver=1.7.7.1 +pkgver=1.9.0 pkgrel=0 pkgdesc="SSH2 protocol library for Python" -url="http://www.lag.net/paramiko/" +url="https://github.com/paramiko/paramiko/" arch="noarch" license="LGPL2+" depends="py-crypto" depends_dev="" -makedepends="python-dev" +makedepends="python-dev py-setuptools" install="" subpackages="$pkgname-demos $pkgname-docs" -source="http://www.lag.net/paramiko/download/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_pkgname-$pkgver +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" python setup.py build || return 1 + python ./test.py || return 1 } package() { @@ -27,15 +28,17 @@ package() { } demos() { - # Put the demo files into a seperate package - mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/demos || return 1 - mv "$_builddir"/demos "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1 + # Put the demo files into a seperate package + mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/demos || return 1 + mv "$_builddir"/demos "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1 } docs() { - # Put the documentation files into a seperate package - mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/docs || return 1 - mv "$_builddir"/docs "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1 + # Put the documentation files into a seperate package + mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/docs || return 1 + mv "$_builddir"/docs "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1 } -md5sums="ce8e2c254378312a264206f65c354d72 paramiko-1.7.7.1.tar.gz" +md5sums="b78472021ff6586dd61ad6972032f54f paramiko-1.9.0.tar.gz" +sha256sums="cb99b74d9c53a23b92803c1c97fdb2bfdab7cd4fea888bd3b6438c127e3b29f5 paramiko-1.9.0.tar.gz" +sha512sums="2f91b68b8a652aa773d14cded7a5f17cf6d758624f981c68510ee3b1302b64ee9290830440dca1a1000b7974ef9dca4f0acd13d01958433b6f35ae8a13e1c0a2 paramiko-1.9.0.tar.gz" diff --git a/testing/py-psycopg2/APKBUILD b/testing/py-psycopg2/APKBUILD index 1ffa2001f8..9d42f70ce9 100644 --- a/testing/py-psycopg2/APKBUILD +++ b/testing/py-psycopg2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-psycopg2 _pkgname=psycopg2 -pkgver=2.4.4 +pkgver=2.4.6 pkgrel=1 pkgdesc="Python-PostgreSQL Database Adapter" url="http://initd.org/psycopg/" @@ -14,8 +14,8 @@ makedepends="python-dev postgresql-dev" install="" subpackages="" source="http://initd.org/psycopg/tarballs/PSYCOPG-2-4/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_pkgname-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" python setup.py build || return 1 @@ -26,4 +26,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="331255d2d44018bcef2ea192aabc1d6a psycopg2-2.4.4.tar.gz" +md5sums="79d7f05e67bf70a0ecc6e9103ccece5f psycopg2-2.4.6.tar.gz" +sha256sums="4edcb40b0a039b4b559a6bc887b2155db8b6c53d0f55b00af8338c77b725621f psycopg2-2.4.6.tar.gz" +sha512sums="da23264f66b4054f26b7029b97856cdab91870e8a6c72cd5dabe37b36c96b3cb19a9adebf49844f5330ae3009f1ff4a81cc28eba1c4baf18e099ca7a10c808ad psycopg2-2.4.6.tar.gz" diff --git a/testing/py-pycountry/APKBUILD b/testing/py-pycountry/APKBUILD index ae47d628d8..47cb7ed22f 100644 --- a/testing/py-pycountry/APKBUILD +++ b/testing/py-pycountry/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-pycountry _pkgname=pycountry -pkgver=0.14.5 -pkgrel=1 +pkgver=0.14.8 +pkgrel=0 pkgdesc="ISO country, subdivision, language, currency and script definitions and their translations" url="http://pypi.python.org/pypi/pycountry" arch="noarch" -license="LGPL2" -depends= -depends_dev="python-dev py-lxml py-setuptools" -makedepends="$depends_dev" +license="LGPL2+" +depends="" +depends_dev="" +makedepends="python-dev py-lxml py-setuptools" install="" subpackages="" source="http://pypi.python.org/packages/source/p/${_pkgname}/${_pkgname}-$pkgver.zip" @@ -26,9 +26,16 @@ prepare() { done } +build() { + cd "$_builddir" + python setup.py build || return 1 +} + package() { cd "$_builddir" python setup.py install --root=$pkgdir/ || return 1 } -md5sums="1834b32f2b4ca3f1b6518388959f2bbc pycountry-0.14.5.zip" +md5sums="2c775e379ba5ca2363f4f595ac9304ba pycountry-0.14.8.zip" +sha256sums="5252b5378ba6f1971aa718248d797fb1e2a33d0bdb975400e4b801549102e2fa pycountry-0.14.8.zip" +sha512sums="99d8ded3addd3dbd03e15d6ed31bd53d3c369c4b516c03f3e7bfa7ed42feda769153f6df0a43fd9129f8123b8ebc22341722dc5883c885b0f4a42ba591b475cd pycountry-0.14.8.zip" diff --git a/testing/py-relatorio/APKBUILD b/testing/py-relatorio/APKBUILD index e367411270..b9a4178241 100644 --- a/testing/py-relatorio/APKBUILD +++ b/testing/py-relatorio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-relatorio _pkgname=relatorio -pkgver=0.5.6 +pkgver=0.5.7 pkgrel=0 pkgdesc="A templating library able to output odt and pdf files" url="http://relatorio.openhex.org" @@ -14,8 +14,8 @@ makedepends="python-dev py-setuptools" install="" subpackages="" source="http://pypi.python.org/packages/source/r/$_pkgname/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_pkgname-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" python setup.py build || return 1 @@ -26,4 +26,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="944fb60fadaff451ab6ee8818de516ad relatorio-0.5.6.tar.gz" +md5sums="e093836cd3a8be996f95088e36c7bcf9 relatorio-0.5.7.tar.gz" +sha256sums="b62dcb87ddf01197e2456a0c399b7499441e82991025a74b1f2be36ea1006fd1 relatorio-0.5.7.tar.gz" +sha512sums="1216de6ef0aeec17b0ead0d4fd4e072c6c8c36da31a52c2b5eaf82d24d429d7f08009ab7b3201658cca163952ad53e5c9c8e144cb9253d85cbac2c0da3893055 relatorio-0.5.7.tar.gz" diff --git a/testing/py-requests/APKBUILD b/testing/py-requests/APKBUILD index ffc853449a..5aaae5edb0 100644 --- a/testing/py-requests/APKBUILD +++ b/testing/py-requests/APKBUILD @@ -1,15 +1,15 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=py-requests -pkgver=1.0.4 +pkgver=1.1.0 pkgrel=0 pkgdesc="HTTP request library for Python" url="http://www.python-requests.org/" arch="noarch" -license="Apache-2" +license="Apache2" depends="python" depends_dev="" -makedepends="python-dev" +makedepends="python-dev py-setuptools" install="" subpackages="" source="http://pypi.python.org/packages/source/r/requests/requests-$pkgver.tar.gz" @@ -35,4 +35,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="0b7448f9e1a077a7218720575003a1b6 requests-1.0.4.tar.gz" +md5sums="a0158815af244c32041a3147ee09abf3 requests-1.1.0.tar.gz" +sha256sums="21a81ddf1a3c2f956524538966ae19c38cae251f5629821588cdc8246a1335f7 requests-1.1.0.tar.gz" +sha512sums="5ab10ba43d492ab227d88b90c7b6db7840232fd7fe4638642f994e1721576bbcf7276515a918a059edf5ded14456eb57e06b76eec9d7f4b95b5489d498de52d4 requests-1.1.0.tar.gz" diff --git a/testing/py-simplejson/APKBUILD b/testing/py-simplejson/APKBUILD index dc357fafbc..477b898b90 100644 --- a/testing/py-simplejson/APKBUILD +++ b/testing/py-simplejson/APKBUILD @@ -1,20 +1,21 @@ # Contributor: Francesco Colista <francesco.colista@gmail.com> # Maintainer: pkgname=py-simplejson -_name=simplejson -pkgver=2.6.2 +_pkgname=simplejson +pkgver=3.1.0 pkgrel=0 pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" url="http://pypi.python.org/pypi/simplejson/" arch="all" license="PSF" depends="" -depends_dev="python-dev" -makedepends="$depends_dev" +depends_dev="" +makedepends="python-dev py-setuptools" install="" subpackages="" -source="http://pypi.python.org/packages/source/s/simplejson/simplejson-2.6.2.tar.gz" -_builddir=${srcdir}/${_name}-${pkgver} +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver prepare() { local i cd "$_builddir" @@ -27,12 +28,14 @@ prepare() { build() { cd "$_builddir" - python setup.py build + python setup.py build || return 1 } package() { cd "$_builddir" - python setup.py install --root="$pkgdir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="9b41cd412dfac7c002aeca61ab0fdfe2 simplejson-2.6.2.tar.gz" +md5sums="71df0076d4a35d29bfea530cb8226c26 simplejson-3.1.0.tar.gz" +sha256sums="10c743fbec819e6ad77999c551f4b620ed498c2dd565c64365f0571b3a252523 simplejson-3.1.0.tar.gz" +sha512sums="c456c689a72ea6d8bae5bd7cc6f41713faca8b4fdd5728694479b861c01d7191aa4e8e864773133093f1c591d2f5ac819b3ac2023bbe59c1793c37aa8e6e88b1 simplejson-3.1.0.tar.gz" diff --git a/testing/py-sip/APKBUILD b/testing/py-sip/APKBUILD index 5f979697db..bfc2edc123 100644 --- a/testing/py-sip/APKBUILD +++ b/testing/py-sip/APKBUILD @@ -2,18 +2,19 @@ # Maintainer: pkgname=py-sip _pkgname=sip -pkgver=4.14 +pkgver=4.14.4 pkgrel=0 pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries" url="http://www.riverbankcomputing.com/software/sip/" arch="all" license="custom:sip" -depends= -depends_dev="python-dev" -makedepends="$depends_dev" +depends="" +depends_dev="" +makedepends="python-dev" install="" subpackages="$pkgname-dev" source="http://sourceforge.net/projects/pyqt/files/sip/sip-$pkgver/sip-$pkgver.tar.gz" + _builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" @@ -27,4 +28,6 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/custom/${pkgname}/LICENSE } -md5sums="9a48ad975e04ac824188840ea498ac32 sip-4.14.tar.gz" +md5sums="ae2d73ef43b8b0f7a9913561e9651706 sip-4.14.4.tar.gz" +sha256sums="325f5933e8bac94e04c29a800f872073f8fcd20260477dca7039f45fb4935eb3 sip-4.14.4.tar.gz" +sha512sums="e58c002c2e1e4895907230e63715931615e36d051e5f01f458c7e9ec9d872868b0ee6231b989630970924e40e321ee895f08d80bc8da289b9da7342dbc8aad59 sip-4.14.4.tar.gz" diff --git a/testing/py-sqlalchemy/APKBUILD b/testing/py-sqlalchemy/APKBUILD index 3673ccaf31..0e33231d5b 100644 --- a/testing/py-sqlalchemy/APKBUILD +++ b/testing/py-sqlalchemy/APKBUILD @@ -1,15 +1,15 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=py-sqlalchemy -pkgver=0.7.9 +pkgver=0.7.10 pkgrel=0 pkgdesc="object relational mapper for python" url="http://pypi.python.org/pypi/SQLAlchemy" arch="all" license="MIT" -depends="python" +depends="" depends_dev="" -makedepends="python-dev" +makedepends="python-dev py-setuptools" install="" subpackages="" source="http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz" @@ -35,4 +35,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="a0b58defc5ad0c7e1baeb932f62d08dd SQLAlchemy-0.7.9.tar.gz" +md5sums="ecc0cd1cd906d17818a5f08fe13ae19e SQLAlchemy-0.7.10.tar.gz" +sha256sums="77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 SQLAlchemy-0.7.10.tar.gz" +sha512sums="631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367 SQLAlchemy-0.7.10.tar.gz" diff --git a/testing/py-twisted-conch/APKBUILD b/testing/py-twisted-conch/APKBUILD index 49503e740f..690aaad280 100644 --- a/testing/py-twisted-conch/APKBUILD +++ b/testing/py-twisted-conch/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=py-twisted-conch -pkgver=12.2.0 +pkgver=12.3.0 pkgrel=0 pkgdesc="SSH and SFTP protocol implementation together with clients and servers" url="http://twistedmatrix.com/trac/wiki/TwistedConch" @@ -31,6 +31,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="a8f07749465eb7c514c9cce0ea4dcfb0 TwistedConch-12.2.0.tar.bz2" -sha256sums="2d1d6d4dcf8a6c9fd7f7c03e74111049566618765f93fae1da999643caf13cd2 TwistedConch-12.2.0.tar.bz2" -sha512sums="6b81ed588aeb568e14ad341530ebceabd34e3025da612aa54effe0ff96ff6c20c466b296795209b6ee761890d27f26075915de114459dbc84547587444520da9 TwistedConch-12.2.0.tar.bz2" +md5sums="448f508394387c04492f5d29413a0a73 TwistedConch-12.3.0.tar.bz2" +sha256sums="5d53e9c26c64e31168121565efbfeb117fc11de8d85cc94bee3fc0a1d189e49b TwistedConch-12.3.0.tar.bz2" +sha512sums="724820896e6ad7b407a5c89b81cc9f4950b12907e67eaf30bad040274215b2cb637731c78fd20b45f60d73f07e40acc74b7c1aa006378f39559c8b0ad22dff66 TwistedConch-12.3.0.tar.bz2" diff --git a/testing/py-xmpppy/APKBUILD b/testing/py-xmpppy/APKBUILD index fefe8e7cf1..e881e34eb5 100644 --- a/testing/py-xmpppy/APKBUILD +++ b/testing/py-xmpppy/APKBUILD @@ -8,20 +8,24 @@ pkgrel=1 pkgdesc="A Python library to provide easy scripting with Jabber" url="http://xmpppy.sourceforge.net/" arch="noarch" -license="GPL" +license="GPL2+" depends="python" makedepends="py-setuptools python-dev" install="" subpackages="" source="http://downloads.sourceforge.net/sourceforge/xmpppy/$_pkgname-$_pkgver.tar.gz" + _builddir=$srcdir/$_pkgname-$_pkgver build() { cd "$_builddir" - python setup.py build + python setup.py build || return 1 } + package() { cd "$_builddir" - mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages - python setup.py install --root="$pkgdir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } + md5sums="e0d2b3f9e4a278c163431e64adb0c861 xmpppy-0.5.0rc1.tar.gz" +sha256sums="519b025b3c9600c26c5805d0c612fe01e61330d2b9869f05c7c416c627820b9a xmpppy-0.5.0rc1.tar.gz" +sha512sums="7fe91ff313533a419e125bb69163dfb122723e67ca70feab00748b5deafc0c99aa002cbebf0f89b8bc7ce465bb2c775ab98509761af07d90295bc1e9c50eee23 xmpppy-0.5.0rc1.tar.gz" diff --git a/testing/py-zmq/APKBUILD b/testing/py-zmq/APKBUILD index 9d718f3890..af12a700d7 100644 --- a/testing/py-zmq/APKBUILD +++ b/testing/py-zmq/APKBUILD @@ -2,20 +2,20 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-zmq _pkgname=pyzmq -pkgver=2.2.0.1 +pkgver=13.0.0 pkgrel=0 pkgdesc="Python bindings for ZeroMQ" url="http://pypi.python.org/pypi/pyzmq" arch="all" -license="LGPL BSD" +license="LGPL3+ BSD" depends="" depends_dev="" makedepends="python-dev py-setuptools zeromq-dev" install="" subpackages="" source="http://pypi.python.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_pkgname-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" python setup.py build || return 1 @@ -26,4 +26,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="f2f80709e84c8ac72d6671eee645d804 pyzmq-2.2.0.1.tar.gz" +md5sums="1325ab6819f7a087eee84aaa951b6f0c pyzmq-13.0.0.tar.gz" +sha256sums="31d8ededdb707f97ffe22963d3f9a721c2330e50904a647cb8d97ec38db43476 pyzmq-13.0.0.tar.gz" +sha512sums="d8e56c5f488ac9d618661c23c714560af44a70705ad092843eb4e9d5ae8b737a65fb59eec91acd9f3dfafafac807c32bf815bd0a2f175649097a28dff308db8e pyzmq-13.0.0.tar.gz" diff --git a/testing/rinse/APKBUILD b/testing/rinse/APKBUILD index d35d27d2f9..8b5e4fc0c4 100644 --- a/testing/rinse/APKBUILD +++ b/testing/rinse/APKBUILD @@ -1,9 +1,9 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=rinse -pkgver=2.0 -pkgrel=3 -pkgdesc="RPM chroot bootstrapping tool" +pkgver=2.0.1 +pkgrel=0 +pkgdesc="A RPM chroot bootstrapping tool" url="http://www.steve.org.uk/Software/rinse/" arch="noarch" license="Artistic" @@ -36,6 +36,12 @@ package() { make PREFIX="$pkgdir" install || return 1 } -md5sums="ccae96895b413bb1040a86d17bec4b06 rinse-2.0.tar.gz +md5sums="1221942846f4caa6e621cfc85f759841 rinse-2.0.1.tar.gz 6761f834b3f50bded544021ccb90c700 rinse-posix-cpio-use.patch 6a6092323c1973832f5c050d37265d99 rinse-device-nodes.patch" +sha256sums="74b1149cb6f12c1bd51e371e5decf4820489535afa9b93900780817cbae7f96b rinse-2.0.1.tar.gz +f869904261add72b2e6a50f910fc79fae44b68df617c8d0d1e1e02d99c77e165 rinse-posix-cpio-use.patch +dfb972611d74889902d1f25edf6bd172aaa8ef62c352a5e966c2892c568171e8 rinse-device-nodes.patch" +sha512sums="4d6284dfd5bdaac1c2578222203c5dd1bfcd325b756583238c45a064da2345ed75615461464845d721026d3ee1b2bab55f138c9fd5d911f7b41a4e7af5ab9cd8 rinse-2.0.1.tar.gz +a8ff20b382fa05bf921d1a99fcf7f1e147a63ff7b2c1d04c312ac9d1148d8acb07c56a016176f081a6c2c6797d31a5bd3607b1d891517888931c42bde9a58465 rinse-posix-cpio-use.patch +9bca1bbbe11453d80f06d330af5695a874240a274ea671f30fd3383f2a88e5e0c73a167aa4ac10f3fde6f9df0cda5678ef436de3ed111a16b008128aafb2a196 rinse-device-nodes.patch" diff --git a/testing/rlwrap/APKBUILD b/testing/rlwrap/APKBUILD index f1b95be204..afe628860c 100644 --- a/testing/rlwrap/APKBUILD +++ b/testing/rlwrap/APKBUILD @@ -6,10 +6,10 @@ pkgrel=0 pkgdesc="GNU Readline wrapper" url="http://utopia.knoware.nl/~hlub/rlwrap/" arch="all" -license="GPL" +license="GPL2+" depends="" -depends_dev="readline-dev ncurses-dev" -makedepends="$depends_dev" +depends_dev="" +makedepends="readline-dev ncurses-dev" install="" subpackages="$pkgname-doc" source="http://utopia.knoware.nl/~hlub/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/testing/rpm/APKBUILD b/testing/rpm/APKBUILD index d41bb7705f..08f1885dc4 100644 --- a/testing/rpm/APKBUILD +++ b/testing/rpm/APKBUILD @@ -1,20 +1,20 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=rpm -pkgver=4.10.2 +pkgver=4.10.3.1 pkgrel=0 pkgdesc="The RPM package manager" url="http://www.rpm.org/" arch="all" license="GPL2 LGPL2+" depends="" -depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev libelf-dev file-dev popt-dev - libcap-dev acl-dev" +depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev + libelf-dev file-dev popt-dev libcap-dev acl-dev" makedepends="$depends_dev graphviz gettext-dev python-dev" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-rpm:py_rpm" source="http://rpm.org/releases/rpm-4.10.x/rpm-$pkgver.tar.bz2 - rpm-uclibc.patch" + rpm-uclibc.patch" _builddir="$srcdir"/rpm-$pkgver prepare() { @@ -58,5 +58,9 @@ py_rpm() { done } -md5sums="a644aea351c9b3889bbaded5d6a377c9 rpm-4.10.2.tar.bz2 +md5sums="7be152323885f6e558bd581f021e5add rpm-4.10.3.1.tar.bz2 5b52ad780c3ec753d1124d6d53697612 rpm-uclibc.patch" +sha256sums="6260e765982936913ca877b042ed0ad863d656e06ec5badc94fa810d36b7368c rpm-4.10.3.1.tar.bz2 +0b43737b018a089351db920f1a72a8984a8dbc11f3a0df4e9722e14bdcd8bec3 rpm-uclibc.patch" +sha512sums="5abb38547c7126ef535dc988ca55f75d834277bcb37556c4da4234355774331f536c7b42e5f4c0dcb4258da30dd47119f208ee9c935c9b943a5d060c48cb7c29 rpm-4.10.3.1.tar.bz2 +0c4a03c1ea6cc3fef2ce25797ad5fbe7b22576fa6ff8d8f3424496e90e13d774e05785cbddf24ed07a7bdc3a25ac4d614537ec5ed1b14f2039c93a1a9077a9ff rpm-uclibc.patch" diff --git a/testing/ruby-daemon-controller/APKBUILD b/testing/ruby-daemon-controller/APKBUILD index 9b1f8d6b76..7acd780215 100644 --- a/testing/ruby-daemon-controller/APKBUILD +++ b/testing/ruby-daemon-controller/APKBUILD @@ -1,30 +1,39 @@ # Contributor: Matt Smith <mcs@darkregion.net> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=ruby-daemon-controller -_realname=daemon_controller -pkgver=0.2.6 +_gemname=daemon_controller +pkgver=1.1.1 pkgrel=0 pkgdesc="A library for robust daemon management." url="http://rubygems.org/gems/daemon_controller" arch="noarch" license="MIT" depends="ruby" -depends_dev= -makedepends="$depends_dev ruby-dev ruby rubygems" +depends_dev="" +makedepends="ruby-dev ruby-gems" install="" subpackages="" -source="" +source="http://rubygems.org/downloads/$_gemname-$pkgver.gem" -_builddir="$srcdir"/$_realname-$pkgver +_builddir="$srcdir"/$_gemname-$pkgver build() { - mkdir -p "$_builddir" || return 1 - local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install $_realname -v $pkgver -i "$_builddir"$_gemdir \ - --ignore-dependencies || return 1 - rm -rf "$_builddir"$_gemdir/cache/ + mkdir -p "$_builddir" || return 1 + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \ + --ignore-dependencies \ + --verbose \ + --no-rdoc \ + --no-ri \ + || return 1 + rm -rf "$pkgdir"/$_gemdir/cache \ + "$pkgdir"/$_geminstdir/ext \ + "$pkgdir"/$_geminstdir/.require_paths } package() { - mkdir -p "$pkgdir" || return 1 - cp -ra "$_builddir"/* "$pkgdir"/ || return 1 + mkdir -p "$pkgdir" || return 1 + cp -ra "$_builddir"/* "$pkgdir"/ || return 1 } +md5sums="d0208bf1e929276dc14665b2cd435535 daemon_controller-1.1.1.gem" +sha256sums="c82bab2e6b6f9443aca51f7f429ac3eb877442f9062da9b28b1a6b329e344ca5 daemon_controller-1.1.1.gem" +sha512sums="fc87dd6deb7db955dc8e75899ea8282cf5755dc76b4139624c6fc8c5caf1b8d995c0e76b3b8222592c4331fa99da890f420a09419ef5c66a680d4dcab0d140fe daemon_controller-1.1.1.gem" diff --git a/testing/ruby-file-tail/APKBUILD b/testing/ruby-file-tail/APKBUILD index 300be82751..d27b3e7d4e 100644 --- a/testing/ruby-file-tail/APKBUILD +++ b/testing/ruby-file-tail/APKBUILD @@ -1,30 +1,40 @@ # Contributor: Matt Smith <mcs@darkregion.net> -# Maintainer: Matt Smith <mcs@darkregion.net> -pkgname=ruby-file-tail -_realname=file-tail -pkgver=1.0.5 +# Maintainer: Matt Smith <mcs@darkregion.net> +_gemname=file-tail +pkgname=ruby-$_gemname +pkgver=1.0.12 pkgrel=0 pkgdesc="Small library that allows Ruby to tail files." url="http://flori.github.com/file-tail/" arch="noarch" -license="GPL" -depends="ruby" -depends_dev= -makedepends="$depends_dev ruby-dev ruby rubygems" +license="GPL2" +depends="ruby ruby-tins" +depends_dev="" +makedepends="ruby-dev ruby-gems" install="" subpackages="" -source="" +source="http://rubygems.org/downloads/$_gemname-$pkgver.gem" -_builddir="$srcdir"/$_realname-$pkgver +_builddir="$srcdir"/$_gemname-$pkgver build() { mkdir -p "$_builddir" || return 1 local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install $_realname -v $pkgver -i "$_builddir"$_gemdir \ - --ignore-dependencies || return 1 - rm -rf "$_builddir"$_gemdir/cache/ + gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \ + --ignore-dependencies \ + --verbose \ + --no-rdoc \ + --no-ri \ + || return 1 + rm -rf "$pkgdir"/$_gemdir/cache \ + "$pkgdir"/$_geminstdir/ext \ + "$pkgdir"/$_geminstdir/.require_paths } package() { mkdir -p "$pkgdir" || return 1 cp -ra "$_builddir"/* "$pkgdir"/ || return 1 } + +md5sums="3875bf548788c00627b12cd486b206df file-tail-1.0.12.gem" +sha256sums="32c490ba6b9f4036291e4e03d20ffffbfd40d65875b50c74e7b7cc23b9edfd57 file-tail-1.0.12.gem" +sha512sums="ec289569e4fdb2f18448c2853916da5c501af2f1be6ad50284ee8404cc259ac9ff9fb88251b889899aa917bc015be78ba385b8050cba22387e772975736a6b1f file-tail-1.0.12.gem" diff --git a/testing/ruby-nokogiri/APKBUILD b/testing/ruby-nokogiri/APKBUILD new file mode 100644 index 0000000000..9a3f8f7df7 --- /dev/null +++ b/testing/ruby-nokogiri/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +_gemname=nokogiri +pkgname=ruby-$_gemname +pkgver=1.5.6 +pkgrel=0 +pkgdesc="An HTML, XML, SAX, and Reader parser" +url="http://nokogiri.org/" +arch="all" +license="MIT" +depends="" +depends_dev="" +makedepends="ruby-gems ruby-dev libxml2-dev libxslt-dev libiconv-dev" +install="" +subpackages="" +source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem" + +_builddir="$srcdir"/$_gemname-$pkgver +build() { + return 0 +} + +package() { + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + local _geminstdir=$_gemdir/gems/$_gemname-$pkgver + mkdir -p "$pkgdir" || return 1 + + gem install --local --install-dir "$pkgdir"/$_gemdir \ + --ignore-dependencies --verbose --no-rdoc --no-ri \ + "$srcdir"/$_gemname-$pkgver.gem || return 1 + rm -rf "$pkgdir"/$_gemdir/cache \ + "$pkgdir"/$_geminstdir/ext \ + "$pkgdir"/$_geminstdir/.require_paths +} + +md5sums="5ccf492f60fd9edc4f86aef3bb97145c nokogiri-1.5.6.gem" +sha256sums="28ab99eeba2270b336f8f9612e5b4aefdc673a7319ad874bf4c6092226826588 nokogiri-1.5.6.gem" +sha512sums="14f4f23732d2f759379fb4cef9afaad790d9553ca7d171d405a3cbba86c458e9853ae20ba622e00327a6d89c0976e17d60f6406c34cf2c15a1effeac66a201d6 nokogiri-1.5.6.gem" diff --git a/testing/ruby-require/APKBUILD b/testing/ruby-require/APKBUILD new file mode 100644 index 0000000000..8998b32406 --- /dev/null +++ b/testing/ruby-require/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +_gemname=require +pkgname=ruby-$_gemname +pkgver=0.2.7 +pkgrel=0 +pkgdesc="A dependencies manager" +url="http://github.com/winton/require" +arch="noarch" +license="MIT" +depends="ruby" +depends_dev="" +makedepends="ruby-dev ruby-gems" +install="" +subpackages="" +source="http://rubygems.org/downloads/$_gemname-$pkgver.gem" + +_builddir="$srcdir"/$_gemname-$pkgver +build() { + mkdir -p "$_builddir" || return 1 + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \ + --ignore-dependencies \ + --verbose \ + --no-rdoc \ + --no-ri \ + || return 1 + rm -rf "$pkgdir"/$_gemdir/cache \ + "$pkgdir"/$_geminstdir/ext \ + "$pkgdir"/$_geminstdir/.require_paths +} + +package() { + mkdir -p "$pkgdir" || return 1 + cp -ra "$_builddir"/* "$pkgdir"/ || return 1 +} + +md5sums="9a1caf852bf72ebf251bc1ceb6a3dec0 require-0.2.7.gem" +sha256sums="353fbb7f73faa1af266956999298e649e6ccd12a6d27397e813a9d6788ac1928 require-0.2.7.gem" +sha512sums="f732967d21e2e834809b661bb69f7750e311fc833a4113481788d5410b3041f791161a25167181e89354d841893d57682273d4dfa8bf3b2643d1e141af83a66c require-0.2.7.gem" diff --git a/testing/ruby-shoulda-context/APKBUILD b/testing/ruby-shoulda-context/APKBUILD index 4c4190990e..c561a828eb 100644 --- a/testing/ruby-shoulda-context/APKBUILD +++ b/testing/ruby-shoulda-context/APKBUILD @@ -1,35 +1,40 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Maintainer: _gemname=shoulda-context pkgname=ruby-shoulda-context -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=0 pkgdesc="Context framework extracted from Shoulda" url="https://github.com/thoughtbot/shoulda" arch="noarch" license="MIT" depends="ruby" -depends_dev= -makedepends="$depends_dev ruby-gems" +depends_dev="" +makedepends="ruby-dev ruby-gems" install="" subpackages="" -source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem" +source="http://rubygems.org/downloads/$_gemname-$pkgver.gem" -_builddir="$srcdir"/$_realname-$pkgver +_builddir="$srcdir"/$_gemname-$pkgver build() { - return 0 -} - -package() { + mkdir -p "$_builddir" || return 1 local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - local _geminstdir=$_gemdir/gems/$_gemname-$pkgver - mkdir -p "$pkgdir" || return 1 - - gem install --local --install-dir "$pkgdir"/$_gemdir \ - --ignore-dependencies --verbose --no-rdoc --no-ri \ - "$srcdir"/$_gemname-$pkgver.gem || return 1 + gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \ + --ignore-dependencies \ + --verbose \ + --no-rdoc \ + --no-ri \ + || return 1 rm -rf "$pkgdir"/$_gemdir/cache \ "$pkgdir"/$_geminstdir/ext \ "$pkgdir"/$_geminstdir/.require_paths } -md5sums="f7c0aaf97f462336cb0136635a679c4b shoulda-context-1.0.1.gem" +package() { + mkdir -p "$pkgdir" || return 1 + cp -ra "$_builddir"/* "$pkgdir"/ || return 1 +} + +md5sums="01ad6b98a2644bda239037553ef2ccce shoulda-context-1.0.2.gem" +sha256sums="ee5559aa13248c70fdec6868a3c144adf7438c904c59d1a76b04a002e5151de5 shoulda-context-1.0.2.gem" +sha512sums="557b85b4e4941bfa92595e8b5f1c1cd37c10f82c2f65a4f645a2f7c56043ef67f7a8ae67fc66aee4ce450261c38f595b455a711159789227cfce14a7e341e7df shoulda-context-1.0.2.gem" diff --git a/testing/ruby-shoulda-matchers/APKBUILD b/testing/ruby-shoulda-matchers/APKBUILD index 7f33b124e7..c2edd24ffd 100644 --- a/testing/ruby-shoulda-matchers/APKBUILD +++ b/testing/ruby-shoulda-matchers/APKBUILD @@ -1,4 +1,5 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Maintainer: _gemname=shoulda-matchers pkgname=ruby-shoulda-matchers pkgver=1.4.1 @@ -8,28 +9,32 @@ url="https://github.com/thoughtbot/shoulda" arch="noarch" license="MIT" depends="ruby ruby-activesupport" -depends_dev= -makedepends="$depends_dev ruby-gems" +depends_dev="" +makedepends="ruby-dev ruby-gems" install="" subpackages="" -source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem" +source="http://rubygems.org/downloads/$_gemname-$pkgver.gem" -_builddir="$srcdir"/$_realname-$pkgver +_builddir="$srcdir"/$_gemname-$pkgver build() { - return 0 -} - -package() { + mkdir -p "$_builddir" || return 1 local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - local _geminstdir=$_gemdir/gems/$_gemname-$pkgver - mkdir -p "$pkgdir" || return 1 - - gem install --local --install-dir "$pkgdir"/$_gemdir \ - --ignore-dependencies --verbose --no-rdoc --no-ri \ - "$srcdir"/$_gemname-$pkgver.gem || return 1 + gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \ + --ignore-dependencies \ + --verbose \ + --no-rdoc \ + --no-ri \ + || return 1 rm -rf "$pkgdir"/$_gemdir/cache \ "$pkgdir"/$_geminstdir/ext \ "$pkgdir"/$_geminstdir/.require_paths } +package() { + mkdir -p "$pkgdir" || return 1 + cp -ra "$_builddir"/* "$pkgdir"/ || return 1 +} + md5sums="03f66e5f1d2c76df58e1fd2dcc778454 shoulda-matchers-1.4.1.gem" +sha256sums="c35693cbfa84213212dffbc2c87487427ef364927340151329a842f0a06086b9 shoulda-matchers-1.4.1.gem" +sha512sums="8987e1ca8c91f504a32e3d46b33973f8f2001c31b931b5cd14089519dcf9391b064957424e03e6da5755aee0dd9688d0f6c1c8a2276af8e80369a89b83f9018f shoulda-matchers-1.4.1.gem" diff --git a/testing/ruby-shoulda/APKBUILD b/testing/ruby-shoulda/APKBUILD index 97738c3549..d405c56f90 100644 --- a/testing/ruby-shoulda/APKBUILD +++ b/testing/ruby-shoulda/APKBUILD @@ -1,35 +1,40 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Maintainer: _gemname=shoulda pkgname=ruby-shoulda -pkgver=2.11.0 +pkgver=3.3.2 pkgrel=0 pkgdesc="Making tests easy on the fingers and eyes" url="https://github.com/thoughtbot/shoulda" arch="noarch" license="MIT" depends="ruby" -depends_dev= -makedepends="$depends_dev ruby-gems" +depends_dev="" +makedepends="ruby-dev ruby-gems" install="" subpackages="" -source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem" +source="http://rubygems.org/downloads/$_gemname-$pkgver.gem" -_builddir="$srcdir"/$_realname-$pkgver +_builddir="$srcdir"/$_gemname-$pkgver build() { - return 0 -} - -package() { + mkdir -p "$_builddir" || return 1 local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - local _geminstdir=$_gemdir/gems/$_gemname-$pkgver - mkdir -p "$pkgdir" || return 1 - - gem install --local --install-dir "$pkgdir"/$_gemdir \ - --ignore-dependencies --verbose --no-rdoc --no-ri \ - "$srcdir"/$_gemname-$pkgver.gem || return 1 + gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \ + --ignore-dependencies \ + --verbose \ + --no-rdoc \ + --no-ri \ + || return 1 rm -rf "$pkgdir"/$_gemdir/cache \ "$pkgdir"/$_geminstdir/ext \ "$pkgdir"/$_geminstdir/.require_paths } -md5sums="a2b7206209fca2d5397ed94ce36256bb shoulda-2.11.0.gem" +package() { + mkdir -p "$pkgdir" || return 1 + cp -ra "$_builddir"/* "$pkgdir"/ || return 1 +} + +md5sums="a925abc6f2f556fd31615e217e52bdf1 shoulda-3.3.2.gem" +sha256sums="52e70b71cbfb7c01dace14e268a62d86c21ddd1e5ec0116c8b1e632d8e04e412 shoulda-3.3.2.gem" +sha512sums="31a5066a1e17e911fa1e0fce1ebc57fa343a5e57601002280fab3762212e5e6394a611a618ea27deb6ec28655b685fd1a77e84c31feb165fad43bdc010524b02 shoulda-3.3.2.gem" diff --git a/testing/ruby-tins/APKBUILD b/testing/ruby-tins/APKBUILD new file mode 100644 index 0000000000..ad8679bb46 --- /dev/null +++ b/testing/ruby-tins/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +_gemname=tins +pkgname=ruby-$_gemname +pkgver=0.7.1 +pkgrel=0 +pkgdesc="Useful ruby library for tools" +url="https://github.com/flori/tins" +arch="noarch" +license="MIT" +depends="ruby" +depends_dev="" +makedepends="ruby-dev ruby-gems" +install="" +subpackages="" +source="http://rubygems.org/downloads/$_gemname-$pkgver.gem" + +_builddir="$srcdir"/$_gemname-$pkgver +build() { + mkdir -p "$_builddir" || return 1 + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \ + --ignore-dependencies \ + --verbose \ + --no-rdoc \ + --no-ri \ + || return 1 + rm -rf "$pkgdir"/$_gemdir/cache \ + "$pkgdir"/$_geminstdir/ext \ + "$pkgdir"/$_geminstdir/.require_paths +} + +package() { + mkdir -p "$pkgdir" || return 1 + cp -ra "$_builddir"/* "$pkgdir"/ || return 1 +} + +md5sums="35df5408c410bee569202df12f9c48ee tins-0.7.1.gem" +sha256sums="71aeb5a2b997bda106a10d783fbebb5c43fc405b23eda7ef2db5d65be721c2c2 tins-0.7.1.gem" +sha512sums="8f58264b2401bea3e218b03fe7df77968f0999941cce1bfeda451e34d42f376ed855a694938684f9c187ad6744b045c1609dd72b544b6bea041080b3af42b74a tins-0.7.1.gem" diff --git a/testing/ruby-yard/APKBUILD b/testing/ruby-yard/APKBUILD index 8e6a322ad1..477fa53f13 100644 --- a/testing/ruby-yard/APKBUILD +++ b/testing/ruby-yard/APKBUILD @@ -1,35 +1,40 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Maintainer: _gemname=yard pkgname=ruby-yard -pkgver=0.8.3 +pkgver=0.8.5.2 pkgrel=0 pkgdesc="A documentation generation tool for Ruby" url="http://yardoc.org" arch="noarch" license="MIT" depends="ruby" -depends_dev= -makedepends="$depends_dev ruby-gems" +depends_dev="" +makedepends="ruby-dev ruby-gems" install="" subpackages="" -source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem" +source="http://rubygems.org/downloads/$_gemname-$pkgver.gem" -_builddir="$srcdir"/$_realname-$pkgver +_builddir="$srcdir"/$_gemname-$pkgver build() { - return 0 -} - -package() { + mkdir -p "$_builddir" || return 1 local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - local _geminstdir=$_gemdir/gems/$_gemname-$pkgver - mkdir -p "$pkgdir" || return 1 - - gem install --local --install-dir "$pkgdir"/$_gemdir \ - --ignore-dependencies --verbose --no-rdoc --no-ri \ - "$srcdir"/$_gemname-$pkgver.gem || return 1 + gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \ + --ignore-dependencies \ + --verbose \ + --no-rdoc \ + --no-ri \ + || return 1 rm -rf "$pkgdir"/$_gemdir/cache \ "$pkgdir"/$_geminstdir/ext \ "$pkgdir"/$_geminstdir/.require_paths } -md5sums="1ecf6a24b7897f073e91067fc3124d6c yard-0.8.3.gem" +package() { + mkdir -p "$pkgdir" || return 1 + cp -ra "$_builddir"/* "$pkgdir"/ || return 1 +} + +md5sums="3dd47e06fb17c7b7de88eb02bfbfb57b yard-0.8.5.2.gem" +sha256sums="6c69c6e488df57d268a8ad406420a28217286a531e15788ae08bbd5266d42a5f yard-0.8.5.2.gem" +sha512sums="a166971827b6692035dabb0e8f69b442e664403af79fc56f48184088f0ca5f1b198d0d81d4eb25042151968ef5f493b8146ab4e933700a8649c69cff99cbb649 yard-0.8.5.2.gem" diff --git a/testing/sarg/APKBUILD b/testing/sarg/APKBUILD index 96628569a5..f63413ff8e 100644 --- a/testing/sarg/APKBUILD +++ b/testing/sarg/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=sarg -pkgver=2.3.1 +pkgver=2.3.5 pkgrel=0 pkgdesc="SARG Squid Analysis Report Generator" url="http://sarg.sourceforge.net/" arch="all" -license="GPL" +license="GPL2+" depends="" depends_dev="" makedepends="$depends_dev" @@ -52,4 +52,6 @@ php() { "$subpkgdir"/usr/share/webapps } -md5sums="bf637b8a820b81e2c55e815934151b4d sarg-2.3.1.tar.gz" +md5sums="a10545aa0571f73789d81dcfca5bfb3c sarg-2.3.5.tar.gz" +sha256sums="661560a3dfbf793ac02260adf8f457029b7cebf676d04a0ecb09b3ba06e0b0fb sarg-2.3.5.tar.gz" +sha512sums="db71db2212d5f4de7d39c0610f7ba0222618a698d5fa6e3a5f8243a0e0bb588d89319e1bca55a92991db01e506e0892e42a8dbd5d132ab6fba7e6421de743f1a sarg-2.3.5.tar.gz" diff --git a/testing/spl-grsec/APKBUILD b/testing/spl-grsec/APKBUILD index 5abbb228ca..a285250fbe 100644 --- a/testing/spl-grsec/APKBUILD +++ b/testing/spl-grsec/APKBUILD @@ -5,7 +5,7 @@ _realname=spl _name=$_realname-$_flavor _kpkg=linux-$_flavor -_kver=3.8.2 +_kver=3.8.3 _kpkgrel=0 _realver=0.6.0-rc14 diff --git a/testing/virtualbox-additions-grsec/APKBUILD b/testing/virtualbox-additions-grsec/APKBUILD index 12410220c3..e9ece55dc8 100644 --- a/testing/virtualbox-additions-grsec/APKBUILD +++ b/testing/virtualbox-additions-grsec/APKBUILD @@ -2,7 +2,7 @@ _flavor=grsec _kpkg=linux-$_flavor -_kver=3.8.2 +_kver=3.8.3 _kpkgrel=0 # when chaning _ver we *must* bump _mypkgrel diff --git a/testing/wanpipe-grsec/APKBUILD b/testing/wanpipe-grsec/APKBUILD index 4f89181713..f0d3a385ee 100644 --- a/testing/wanpipe-grsec/APKBUILD +++ b/testing/wanpipe-grsec/APKBUILD @@ -4,7 +4,7 @@ _realname=wanpipe _name=$_realname-$_flavor _kpkg=linux-$_flavor -_kver=3.8.2 +_kver=3.8.3 _kpkgrel=0 # source the kernel version diff --git a/testing/x2goserver/APKBUILD b/testing/x2goserver/APKBUILD index c8d5d78aff..d3e790ae00 100644 --- a/testing/x2goserver/APKBUILD +++ b/testing/x2goserver/APKBUILD @@ -1,21 +1,21 @@ # Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: pkgname=x2goserver -pkgver=3.1.0.1 +pkgver=4.0.0.0 pkgrel=0 pkgdesc="Terminal server" url="http://x2go.org" arch="all" -license="GPL" +license="GPL2+" depends="" makedepends="libssh2-dev perl-dbd-sqlite python-dev xauth bash man" install="$pkgname.pre-install" subpackages="$pkgname-doc" -source="http://code.x2go.org/releases/source/x2goserver/${pkgname}_${pkgver}.tar.gz" +source="http://code.x2go.org/releases/source/$pkgname/$pkgname-$pkgver.tar.gz" pkgusers="x2gouser" pkggroups="x2gouser" -_builddir="$srcdir"/${pkgname}_${pkgver} +_builddir="$srcdir"/$pkgname-$pkgver prepare() { local i cd "$_builddir" @@ -31,12 +31,14 @@ prepare() { build() { cd "$_builddir" - make + make || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install || return 1 } -md5sums="ae484646e5bd16363a5d49204f5bdf0c x2goserver_3.1.0.1.tar.gz" +md5sums="1fc38566832c30897c6583e7ffa1fda3 x2goserver-4.0.0.0.tar.gz" +sha256sums="32c7926edeecd8d9362711ba34f9795821e140bb8d10d056c4f4c2c98fb1778f x2goserver-4.0.0.0.tar.gz" +sha512sums="f951bfffb398a7ff9e2d59714a742d0c02180b8264a83292a88b10c7d08816c20f0d6ab2f3147717d0f6784153606814257cf5be7850bebb811340aafeaeb7db x2goserver-4.0.0.0.tar.gz" diff --git a/testing/zfs-grsec/APKBUILD b/testing/zfs-grsec/APKBUILD index f2f7680592..072138821a 100644 --- a/testing/zfs-grsec/APKBUILD +++ b/testing/zfs-grsec/APKBUILD @@ -6,7 +6,7 @@ _realname=zfs _name=$_realname-$_flavor _kpkg=linux-$_flavor -_kver=3.8.2 +_kver=3.8.3 _kpkgrel=0 _realver=0.6.0-rc14 |