From 3aa7eb3e790027f07b91dda58efd7e53c4afdbc1 Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Wed, 20 Apr 2011 17:13:25 +0000 Subject: [net-wireless/wimax-tools] Version bump Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64 --- net-wireless/wimax-tools/ChangeLog | 10 +- net-wireless/wimax-tools/Manifest | 34 ++- ...ctx-move-to-internal.h-to-wimaxll.h-fixin.patch | 293 --------------------- .../wimax-tools/wimax-tools-1.4.4-r1.ebuild | 32 --- net-wireless/wimax-tools/wimax-tools-1.4.4.ebuild | 28 -- net-wireless/wimax-tools/wimax-tools-1.4.5.ebuild | 24 ++ 6 files changed, 49 insertions(+), 372 deletions(-) delete mode 100644 net-wireless/wimax-tools/files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch delete mode 100644 net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild delete mode 100644 net-wireless/wimax-tools/wimax-tools-1.4.4.ebuild create mode 100644 net-wireless/wimax-tools/wimax-tools-1.4.5.ebuild (limited to 'net-wireless/wimax-tools') diff --git a/net-wireless/wimax-tools/ChangeLog b/net-wireless/wimax-tools/ChangeLog index 584db9e9608a..47bc538d93e8 100644 --- a/net-wireless/wimax-tools/ChangeLog +++ b/net-wireless/wimax-tools/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-wireless/wimax-tools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax-tools/ChangeLog,v 1.5 2011/02/23 11:19:04 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax-tools/ChangeLog,v 1.6 2011/04/20 17:13:24 alexxy Exp $ + +*wimax-tools-1.4.5 (20 Apr 2011) + + 20 Apr 2011; Alexey Shvetsov + -files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patc + h, -wimax-tools-1.4.4.ebuild, -wimax-tools-1.4.4-r1.ebuild, + +wimax-tools-1.4.5.ebuild: + Version bump *wimax-tools-1.4.4-r1 (23 Feb 2011) diff --git a/net-wireless/wimax-tools/Manifest b/net-wireless/wimax-tools/Manifest index c4acdc7c1605..7c75a1ad9d2f 100644 --- a/net-wireless/wimax-tools/Manifest +++ b/net-wireless/wimax-tools/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch 7712 RMD160 788aefbe5ed998222614ea2fc1a230e3a67e8561 SHA1 e21bc394268fbbe07ff2a0e4ed46908489e5288f SHA256 2e5450873881a0f83cb0d1ddd8fd5889f65f0053f189872ad3101db97fbdc4d2 -DIST wimax-tools-1.4.4.tar.gz 361572 RMD160 cbf7830bbee11a49c326107c47b24a2b0993372b SHA1 87c5f5d5ad495c69abe1d83838c3f40a5162dbe0 SHA256 63ea9796704ae2f0e324b655398d103cdd4261d9a2e58d6a41c5574719dec4bd -EBUILD wimax-tools-1.4.4-r1.ebuild 800 RMD160 70a21bd5cc5bb5116d23674be4f76ca3927dc22f SHA1 0bb7d016c4df68166e4e17406a1b333de2b662ac SHA256 443f718afa62df271af2fbc603fb6f074f912f450fec462615584118c1fee481 -EBUILD wimax-tools-1.4.4.ebuild 691 RMD160 50cf4e181e55c2c5938267a103fde695628d6589 SHA1 41c59fe9289ccf07d852178637e17b6136078bd6 SHA256 89ee2f1e822e8ed2a300c50dc425c0bda30612856c0f1d15ad5dae3f0c51f53e -MISC ChangeLog 1068 RMD160 fc0b2177529b0c4d333d4975dab9251ff242623a SHA1 a442f6a95cdff2d3ecb0e5948b828d49ba045686 SHA256 b3b32e4a633a1efc5428a76aaba5872d55a4e4116e61e1a8229c3dfaad5c9b87 +DIST wimax-tools-1.4.5.tar.gz 374333 RMD160 dcd7f3bb1483e835ce1ba38adba8b6ffec9e135a SHA1 19c497b6b5312fc359f95daeb8eab4ce748c32a3 SHA256 d27c49d618796250839f2b9183b7713ceb31f96d273a802854a6c524ba01cf0c +EBUILD wimax-tools-1.4.5.ebuild 657 RMD160 5cba2ed351d49d3477001cfd6d201bed9d40ce43 SHA1 94a2a5fb2b2a2af4943f604408ad27b70ccf2e3c SHA256 835cfa9d30e106505791458c0afaa10163338f1e5bc7365a944a5860af675270 +MISC ChangeLog 1340 RMD160 6ea9228eece02983caa5b4bb5c01aa3c1899f0f1 SHA1 4ed05a7f13b910da9c7eb9c0107d0a256a20a0ac SHA256 34bd5ed509e9b16f3fa65ba5691252860dcdbad713227fee1cbbbe7f23fcc9ba MISC metadata.xml 250 RMD160 94be601f620e3158922f31ac28328a28665555a2 SHA1 ac8010695121148bf3593692aba56938187882c9 SHA256 aea796ea3b08f1f5ca77c34868298e406de62590afbf2662e87d094c3e0041f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJNZO1PAAoJEOf+E+/4L5LmPYsP/iRriSiCn5pyx83aRJ1D31Qt -hNO6xyy9Xl+wCbNuQqQcr7rU9GiKHSegRfY2xvEsHlhptkYE0d004Qepfm5lMvpU -yIMRHW4GAdc0g7QvTEPdaKqN4JoZqPMcsrj7rzcWmkGTqiRiqBn+gmRFA9HPFAfA -mKSE/9aO2S7afO4+mCmNIlRKKlX1Kf/LQgvOqQME6Ck3A4zEOzirrf9NcivmJT11 -Ag0IBzwvwf2N6T9Y1KhiJ7T0SCGdQSnkOuVL62uiLo3G/6ONnz9SRcLlYrFfz8bi -/db5eRQ9HPXe30iuQWu/iFUXhEIE9y139XzS4ZnSLcBW/8ZTSDXT+PGulL6xUdVt -soJeEOVdET4WlcqVpDOsnVyzZx4IciBU2zC9GlS7WtLEmsI1T+kplsbUMhiQRtMS -eIKIudjoq5jqmVdsLmb0m+z0iJGPkc97GiZLk1agbHlxw98K+sauwyRX3puEh9Yx -L9ywXXQXFV2lHOMMKnYCc9rRhPcK8h22/4MVof791GBrNlPQJ08+dwjWY/gAyIHe -/CJic2zMSJVPQZjwf0hpCLIB+XD6hmaR/d0L8qYef40XdKcNB+UlgVw4is/KmIUw -3McX7gDGdUI73MWE5FMPUCBCphZ9317k0nz80hXSZr8LhF975vm59dUf2JTc6hwu -8yhrjYp7H/IACKs0YZCj -=DAqP +iQIcBAEBCAAGBQJNrxQ0AAoJEOf+E+/4L5Lmul4P/RO48x8gRCnlyYdwNTOP09W5 +VYI+5NXxdDtKxk0g0vI9BsQWRxSaMsAywuhRtb4GgYl53UQWbIZ3+6JCzNCmRDle ++Uu5m0tnLewFcVkH5+/RQMqY+M+u15UsYSnsA0YGnPt0xZPkURcNK0B2t40balPS +zZ00FSIQJnd2hKMZrHdp4T4D21jGOlLGok0hqzvIvceJr1krlMfTEgR6LRK/2R75 +xzKLlUcNOxUt5XS7ocKsy9B17TzEgZk8SR3FsBVbEppUczXYpjCgK0JOgi+QWbbk +2AZzUeFvH3z8seYpOIEyVYs557EmhxCzcPlV0ZNLV8uRuFIVD+l48i8R1AFZYTld +w1Mxa9eLyyDJcgsrCkXdllNbCSfB4K1TA89/Bu35E015Tn/ks3QUDK8IQ7gtGUBP +9egJ5ZhloBS/2A01wtf27SLqLU9t1ktxOz6mIAMBeRvQlm8En/iazc59VSl6m7gN +8XZ4r5WoyBwW4ktMGi625ru1MJ1XgLm+Mcz3czCPxPL9U2eM2rSQt9S1izUMblaV +lQj+sfODDpeM5VenCxUUSwPHqyMH3su6Nt5NJDkjkUa+Y+KauE6GFo8ez3G8DEp8 +RcME+5YuAfwEAewBSQjJD4zcXfFrImxxUNPX8k2hLUbvnr1M/9OVeBQZ5TcK2XAN +sqbyXEdwoVWJQd1chO2Y +=gT/r -----END PGP SIGNATURE----- diff --git a/net-wireless/wimax-tools/files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch b/net-wireless/wimax-tools/files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch deleted file mode 100644 index da8b1894a913..000000000000 --- a/net-wireless/wimax-tools/files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch +++ /dev/null @@ -1,293 +0,0 @@ -From 26da46f5756cdcdae963ea504fef27efcb63ba8b Mon Sep 17 00:00:00 2001 -From: Inaky Perez-Gonzalez -Date: Fri, 28 Jan 2011 12:11:35 -0800 -Subject: [PATCH] wimaxll_cb_ctx: move to internal.h to wimaxll.h (fixing bug #20) - -The context declaration and macros are needed by client programs; they -were misplaced. - -Reported-by: Mathieu Peresse -Signed-off-by: Inaky Perez-Gonzalez ---- - include/wimaxll.h | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/internal.h | 126 ---------------------------------------------------- - 2 files changed, 127 insertions(+), 126 deletions(-) - -diff --git a/include/wimaxll.h b/include/wimaxll.h -index c9dde3f..3149bf2 100644 ---- a/include/wimaxll.h -+++ b/include/wimaxll.h -@@ -307,6 +307,133 @@ typedef int (*wimaxll_state_change_cb_f)( - enum wimax_st old_state, enum wimax_st new_state); - - -+ -+/** -+ * General structure for storing callback context -+ * -+ * \ingroup callbacks -+ * -+ * Callbacks set by the user receive a user-set pointer to a context -+ * structure. The user can wrap this struct in a bigger context struct -+ * and use wimaxll_container_of() during the callback to obtain its -+ * pointer. -+ * -+ * Usage: -+ * -+ * \code -+ * ... -+ * struct wimaxll_handle *wmx; -+ * ... -+ * struct my_context { -+ * struct wimaxll_cb_ctx ctx; -+ * -+ * } my_ctx = { -+ * .ctx = WIMAXLL_CB_CTX_INIT(wmx), -+ * -+ * }; -+ * ... -+ * wimaxll_set_cb_SOMECALLBACK(wmx, my_callback, &my_ctx.ctx); -+ * ... -+ * result = wimaxll_pipe_read(wmx); -+ * ... -+ * -+ * // When my_callback() is called -+ * my_callback(wmx, ctx, ...) -+ * { -+ * struct my_context *my_ctx = wimaxll_container_of( -+ * ctx, struct my_callback, ctx); -+ * ... -+ * // do stuff with my_ctx -+ * } -+ * \endcode -+ * -+ * \param wmx WiMAX handle this context refers to (for usage by the -+ * callback). -+ * \param result Result of the handling of the message. For usage by -+ * the callback. Should not be set to -EINPROGRESS, as this will -+ * be interpreted by the message handler as no processing was done -+ * on the message. -+ * -+ * \internal -+ * -+ * \param msg_done This is used internally to mark when the acks (or -+ * errors) for a message have been received and the message -+ * receiving loop can be considered done. -+ */ -+struct wimaxll_cb_ctx { -+ struct wimaxll_handle *wmx; -+ ssize_t result; -+ unsigned msg_done:1; /* internal */ -+}; -+ -+ -+/** -+ * Initialize a definition of struct wimaxll_cb_ctx -+ * -+ * \param _wmx pointer to the WiMAX device handle this will be -+ * associated to -+ * -+ * Use as: -+ * -+ * \code -+ * struct wimaxll_handle *wmx; -+ * ... -+ * struct wimaxll_cb_ctx my_context = WIMAXLL_CB_CTX_INIT(wmx); -+ * \endcode -+ * -+ * \ingroup callbacks -+ */ -+#define WIMAXLL_CB_CTX_INIT(_wmx) { \ -+ .wmx = (_wmx), \ -+ .result = -EINPROGRESS, \ -+} -+ -+ -+static inline // ugly workaround for doxygen -+/** -+ * Initialize a struct wimaxll_cb_ctx -+ * -+ * \param ctx Pointer to the struct wimaxll_cb_ctx. -+ * \param wmx pointer to the WiMAX device handle this will be -+ * associated to -+ * -+ * Use as: -+ * -+ * \code -+ * struct wimaxll_handle *wmx; -+ * ... -+ * struct wimaxll_cb_ctx my_context; -+ * ... -+ * wimaxll_cb_ctx(&my_context, wmx); -+ * \endcode -+ * -+ * \ingroup callbacks -+ * \fn static void wimaxll_cb_ctx_init(struct wimaxll_cb_ctx *ctx, struct wimaxll_handle *wmx) -+ */ -+void wimaxll_cb_ctx_init(struct wimaxll_cb_ctx *ctx, struct wimaxll_handle *wmx) -+{ -+ ctx->wmx = wmx; -+ ctx->result = -EINPROGRESS; -+} -+ -+ -+static inline // ugly workaround for doxygen -+/** -+ * Set the result value in a callback context -+ * -+ * \param ctx Context where to set -- if NULL, no action will be taken -+ * \param val value to set for \a result -+ * -+ * \ingroup callbacks -+ * \fn static void wimaxll_cb_maybe_set_result(struct wimaxll_cb_ctx *ctx, int val) -+ */ -+void wimaxll_cb_maybe_set_result(struct wimaxll_cb_ctx *ctx, int val) -+{ -+ if (ctx != NULL && ctx->result == -EINPROGRESS) -+ ctx->result = val; -+} -+ -+ - /* Basic handle management */ - struct wimaxll_handle *wimaxll_open(const char *device_name); - void *wimaxll_priv_get(struct wimaxll_handle *); -diff --git a/lib/internal.h b/lib/internal.h -index a5cd272..178ac1e 100644 ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -54,132 +54,6 @@ enum { - - - /** -- * General structure for storing callback context -- * -- * \ingroup callbacks -- * -- * Callbacks set by the user receive a user-set pointer to a context -- * structure. The user can wrap this struct in a bigger context struct -- * and use wimaxll_container_of() during the callback to obtain its -- * pointer. -- * -- * Usage: -- * -- * \code -- * ... -- * struct wimaxll_handle *wmx; -- * ... -- * struct my_context { -- * struct wimaxll_cb_ctx ctx; -- * -- * } my_ctx = { -- * .ctx = WIMAXLL_CB_CTX_INIT(wmx), -- * -- * }; -- * ... -- * wimaxll_set_cb_SOMECALLBACK(wmx, my_callback, &my_ctx.ctx); -- * ... -- * result = wimaxll_pipe_read(wmx); -- * ... -- * -- * // When my_callback() is called -- * my_callback(wmx, ctx, ...) -- * { -- * struct my_context *my_ctx = wimaxll_container_of( -- * ctx, struct my_callback, ctx); -- * ... -- * // do stuff with my_ctx -- * } -- * \endcode -- * -- * \param wmx WiMAX handle this context refers to (for usage by the -- * callback). -- * \param result Result of the handling of the message. For usage by -- * the callback. Should not be set to -EINPROGRESS, as this will -- * be interpreted by the message handler as no processing was done -- * on the message. -- * -- * \internal -- * -- * \param msg_done This is used internally to mark when the acks (or -- * errors) for a message have been received and the message -- * receiving loop can be considered done. -- */ --struct wimaxll_cb_ctx { -- struct wimaxll_handle *wmx; -- ssize_t result; -- unsigned msg_done:1; /* internal */ --}; -- -- --/** -- * Initialize a definition of struct wimaxll_cb_ctx -- * -- * \param _wmx pointer to the WiMAX device handle this will be -- * associated to -- * -- * Use as: -- * -- * \code -- * struct wimaxll_handle *wmx; -- * ... -- * struct wimaxll_cb_ctx my_context = WIMAXLL_CB_CTX_INIT(wmx); -- * \endcode -- * -- * \ingroup callbacks -- */ --#define WIMAXLL_CB_CTX_INIT(_wmx) { \ -- .wmx = (_wmx), \ -- .result = -EINPROGRESS, \ --} -- -- --static inline // ugly workaround for doxygen --/** -- * Initialize a struct wimaxll_cb_ctx -- * -- * \param ctx Pointer to the struct wimaxll_cb_ctx. -- * \param wmx pointer to the WiMAX device handle this will be -- * associated to -- * -- * Use as: -- * -- * \code -- * struct wimaxll_handle *wmx; -- * ... -- * struct wimaxll_cb_ctx my_context; -- * ... -- * wimaxll_cb_ctx(&my_context, wmx); -- * \endcode -- * -- * \ingroup callbacks -- * \fn static void wimaxll_cb_ctx_init(struct wimaxll_cb_ctx *ctx, struct wimaxll_handle *wmx) -- */ --void wimaxll_cb_ctx_init(struct wimaxll_cb_ctx *ctx, struct wimaxll_handle *wmx) --{ -- ctx->wmx = wmx; -- ctx->result = -EINPROGRESS; --} -- -- --static inline // ugly workaround for doxygen --/** -- * Set the result value in a callback context -- * -- * \param ctx Context where to set -- if NULL, no action will be taken -- * \param val value to set for \a result -- * -- * \ingroup callbacks -- * \fn static void wimaxll_cb_maybe_set_result(struct wimaxll_cb_ctx *ctx, int val) -- */ --void wimaxll_cb_maybe_set_result(struct wimaxll_cb_ctx *ctx, int val) --{ -- if (ctx != NULL && ctx->result == -EINPROGRESS) -- ctx->result = val; --} -- -- --/** - * A WiMax control pipe handle - * - * This type is opaque to the user --- -1.7.4.1 - diff --git a/net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild b/net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild deleted file mode 100644 index 7861fdbe02d1..000000000000 --- a/net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild,v 1.1 2011/02/23 11:19:04 alexxy Exp $ - -EAPI="3" - -inherit linux-info base - -DESCRIPTION="Tools to use Intel's WiMax cards" -HOMEPAGE="http://www.linuxwimax.org" -SRC_URI="http://linuxwimax.org/Download?action=AttachFile&do=get&target=${P}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=sys-kernel/linux-headers-2.6.34 - >=dev-libs/libnl-1.0" -RDEPEND="" - -PATCHES=( - "${FILESDIR}/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch" -) - -pkg_setup() { - linux-info_pkg_setup -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" -} diff --git a/net-wireless/wimax-tools/wimax-tools-1.4.4.ebuild b/net-wireless/wimax-tools/wimax-tools-1.4.4.ebuild deleted file mode 100644 index 0d15c605d7be..000000000000 --- a/net-wireless/wimax-tools/wimax-tools-1.4.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax-tools/wimax-tools-1.4.4.ebuild,v 1.1 2010/11/08 17:45:26 alexxy Exp $ - -EAPI="3" - -inherit linux-info - -DESCRIPTION="Tools to use Intel's WiMax cards" -HOMEPAGE="http://www.linuxwimax.org" -SRC_URI="http://linuxwimax.org/Download?action=AttachFile&do=get&target=${P}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=sys-kernel/linux-headers-2.6.34 - >=dev-libs/libnl-1.0" -RDEPEND="" - -pkg_setup() { - linux-info_pkg_setup -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" -} diff --git a/net-wireless/wimax-tools/wimax-tools-1.4.5.ebuild b/net-wireless/wimax-tools/wimax-tools-1.4.5.ebuild new file mode 100644 index 000000000000..5672713b85d3 --- /dev/null +++ b/net-wireless/wimax-tools/wimax-tools-1.4.5.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax-tools/wimax-tools-1.4.5.ebuild,v 1.1 2011/04/20 17:13:24 alexxy Exp $ + +EAPI="3" + +inherit linux-info base + +DESCRIPTION="Tools to use Intel's WiMax cards" +HOMEPAGE="http://www.linuxwimax.org" +SRC_URI="http://linuxwimax.org/Download?action=AttachFile&do=get&target=${P}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=sys-kernel/linux-headers-2.6.34 + >=dev-libs/libnl-1.0" +RDEPEND="" + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" +} -- cgit v1.2.3-65-gdbad