From 9ebba4faed96acb5caf551adb2bf5f7968bd6f66 Mon Sep 17 00:00:00 2001 From: "Francisco Blas Izquierdo Riera (klondike)" Date: Sun, 19 Aug 2012 05:51:06 +0200 Subject: Adding a patch fixing issues with a signal --- net-p2p/adchpp/ChangeLog | 6 + net-p2p/adchpp/Manifest | 3 +- net-p2p/adchpp/adchpp-2.8.1-r1.ebuild | 154 +++++++++++++++++++++ net-p2p/adchpp/adchpp-2.8.1.ebuild | 153 -------------------- .../files/adchpp-2.8.1-fix_disconnect_signal.patch | 88 ++++++++++++ 5 files changed, 250 insertions(+), 154 deletions(-) create mode 100644 net-p2p/adchpp/adchpp-2.8.1-r1.ebuild delete mode 100644 net-p2p/adchpp/adchpp-2.8.1.ebuild create mode 100644 net-p2p/adchpp/files/adchpp-2.8.1-fix_disconnect_signal.patch (limited to 'net-p2p') diff --git a/net-p2p/adchpp/ChangeLog b/net-p2p/adchpp/ChangeLog index 2a6018f..32daf64 100644 --- a/net-p2p/adchpp/ChangeLog +++ b/net-p2p/adchpp/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*adchpp-2.8.1-r1 (19 Aug 2012) + + 19 Aug 2012; Francisco Blas Izquierdo Riera (klondike) -adchpp-2.8.1.ebuild, + +adchpp-2.8.1-r1.ebuild, +files/adchpp-2.8.1-fix_disconnect_signal.patch: + Adding a patch fixing issues with a signal + 14 Aug 2012; Francisco Blas Izquierdo Riera (klondike) adchpp-2.8.0.ebuild, adchpp-2.8.1.ebuild: Fixed issues with FL_DataBase and the log dir diff --git a/net-p2p/adchpp/Manifest b/net-p2p/adchpp/Manifest index 1ae2cdc..ae751dd 100644 --- a/net-p2p/adchpp/Manifest +++ b/net-p2p/adchpp/Manifest @@ -4,6 +4,7 @@ AUX adchpp-2.8.0-fix_doc_includes.patch 1668 RMD160 6f56712768289c082b5ca26cf856 AUX adchpp-2.8.0-fix_guide_paths.patch 687 RMD160 37340a5d6c04ddec175f9da6bddedc6ea61c7a94 SHA1 892e5ab367ba6dbeaa344556df14072705529c38 SHA256 35ae569de9a6fadb44fad07b659391527627f9dc1911a8495f8ff11a8b036da2 AUX adchpp-2.8.0-fix_python.patch 584 RMD160 4529ce6ad883a2179243faf090e270d0937ebd89 SHA1 c3fe4d4abca47dbb95af7f60055d3780ef05df9d SHA256 022dee2338a596451987e0696abaa7c65a81b02a4e01062aeff0c0f1a401cf11 AUX adchpp-2.8.0-fix_ruby.patch 1937 RMD160 ac9f6f09b96105ea4b6a2837cf843515907a4261 SHA1 defc6f2f4f936aab412135536f1a333fb7bbf607 SHA256 e0a2ec075af4394950de69fd64d9eeeae662723832157abefc561f9c17fd9b90 +AUX adchpp-2.8.1-fix_disconnect_signal.patch 3044 RMD160 01eab10b4738f79a5bfacf4aef289fedf32e5dde SHA1 6486b768650b57341e49744ff483becf2d674499 SHA256 c8626cf2fe33e119266a54ee44634e22bc76a4fe316e6f1df7352b123c3c62f0 AUX adchpp-2.8.1-fix_python.patch 712 RMD160 9244a6a2fabd7aa869583635e710c0639fb89f8b SHA1 7a521ac4b2dd658a4f4471b7b51519601b8d3452 SHA256 844d58c65e4629c7406eca60147fe8c56bc5f70b5e3f56a2538695dc30a36a5d AUX adchpp.conf.d 310 RMD160 3e8c898256490130b59ac6bf04e79e204448a483 SHA1 84bab09886f43651a884b51ffc2bf26e59d94e05 SHA256 15955fc380ae76be3b235cb2d87cb55d7e356ff23a1bde47defc06b686e1ec57 AUX adchpp.init.d 466 RMD160 a5fb587e8016c1b6730ee139b41bb297ccce5013 SHA1 ec502cb70204e31cfb48bfd0af9183f0c5a5698c SHA256 7ec336d63857aca5f10d2c94b4b59cdc713aa4bebe2c71d8505fe0ed1668aa27 @@ -11,7 +12,7 @@ AUX adchpp_runner.sh 185 RMD160 72c35fba3ea4425c7ebda2baee69c2d649220721 SHA1 15 DIST adchpp_2.8.0_source.tar.gz 8446076 RMD160 058b73713c6f593a9dca30393272bd43be9de461 SHA1 277d84017d3d911d1449d3245db5bf0fcb7ed63e SHA256 7819f18f4fbd5a17f1e06ca9aa66f6c1a31d59cab7b0e600940283aa0e6307c2 DIST adchpp_2.8.1_source.tar.gz 8551219 RMD160 c269283efcd2853f12d31db6f52c0c7b5165676a SHA1 2892c41e9c0922f61f9ae424b2ea48e6565bb8b6 SHA256 666e68056d6e4fc1f59ed2822eed914af293fa708fb943a046b40b4ba294a4f3 EBUILD adchpp-2.8.0.ebuild 4099 RMD160 ba84a93d3caac2400d2d1f0d8f7267fac9158471 SHA1 1b45bf06e2843eba5f49413260c2025a21ab2b44 SHA256 c1115000de26fb362a30d5b7de5fa72fb58e09eb0d8898e2e2856f1f704fe917 -EBUILD adchpp-2.8.1.ebuild 3918 RMD160 8264b49878c539a114313f24be7540b5c2e28ad7 SHA1 11432b50f1d418de9ccbe19fcfa1fd15bebde540 SHA256 6435d1de573a2e8cf07fadbd3e9ef60d97e68d1af1f940dc558a33188c9ae7a2 +EBUILD adchpp-2.8.1-r1.ebuild 3980 RMD160 b9c8ed474d7a0332fb4820b1eff24d8c271b3b7f SHA1 24570bb5867182e4a350f694d4ec6480f59d7ebd SHA256 bca5482d76fe8ec1525f4d230c50d9c8d2bcc2a5afad6e1db9f375febef04ffe MISC ChangeLog 861 RMD160 495025950443e0a573acb40f1601b487947e25d2 SHA1 1e712ad456be6d078897721b758ef337ca088c39 SHA256 a1406fe6bbbe5adc0f7e928fffab5ae5df7e67254050d7bc9b720c93bf842f47 MISC TODO 112 RMD160 ddf91c86b1dbc3e00393e25046fcb6c734cee754 SHA1 bc896d708667823c5b86d12c5e65fab769a521ea SHA256 4d3a6f431d988c8ac37e6bbdb8fc946ddc591cce2029a83a339e0b16e4954d4c MISC metadata.xml 407 RMD160 025a9c56902d342189f308d98ed986fb5fba2ac1 SHA1 d4faaafc9dc058d10e7fb3c3ae75c6d526b2f39f SHA256 f5001e99b6181be8bac1b3ba8dbbce6ff2d63084ea64816cbb16d53a6871738b diff --git a/net-p2p/adchpp/adchpp-2.8.1-r1.ebuild b/net-p2p/adchpp/adchpp-2.8.1-r1.ebuild new file mode 100644 index 0000000..b07f85b --- /dev/null +++ b/net-p2p/adchpp/adchpp-2.8.1-r1.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +SCONS_MIN_VERSION=1.2.0 + +inherit eutils scons-utils toolchain-funcs + +DESCRIPTION="ADC protocol hub made by the people behind DC++" +HOMEPAGE="http://adchpp.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_source.tar.gz" +S="${WORKDIR}/${PN}_${PV}_source" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~x86" +#TODOS: +#Add info on script and bloom uses +#Python use only on x86 builds +#Select languages +IUSE="+bloom debug doc +lua pch +python +ruby +script +ssl" + +RDEPEND="ssl? ( dev-libs/openssl ) + python? ( || ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) ) + ruby? ( >=dev-lang/ruby-1.9.2 dev-lang/ruby:1.9 ) + sys-libs/readline" +DEPEND="${RDEPEND} + >=dev-lang/swig-1.3.40 + >=sys-devel/gcc-4.4 + ruby? ( >=dev-ruby/rubygems-1.8 ) + doc? ( >=app-text/asciidoc-8.6 )" + +#This sets some useful variables needed for configure and install +pkg_setup() { + if use x86; then + export tarch=x86 + elif use amd64; then + export tarch=x64 + elif use ia64; then + export tarch=ia64 + else + die "Invalid arch" + fi + + if use debug; then + export tmode=debug + else + export tmode=release + fi + #Shortcut for the packages library dir + export libpath="/usr/$(get_libdir)/${P}" + export logpath="/var/log/${PN}" + export etcpath="/etc/${PN}" + export sharepath="/usr/share/${P}" + export varpath="/var/lib/${PN}" + + #Create the users + enewgroup adchpp + enewuser adchpp -1 -1 -1 "adchpp" +} + +src_configure() { + mylangs="" + use lua && mylangs=$mylangs,lua + use python && mylangs=$mylangs,python + use ruby && mylangs=$mylangs,ruby + + myplugins="" + use bloom && myplugins=$myplugins,Bloom + use script && myplugins=$myplugins,Script + + myesconsargs=( +# CC="$(tc-getCC)" + plugins=$myplugins + langs=$mylangs + mode=$tmode + $(use_scons ssl secure) + $(use_scons pch gch) + $(use_scons doc docs) + arch=$tarch +#to use propper ruby + ruby=ruby19 + ) +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-2.8.0-fix_config_paths.patch" + epatch "${FILESDIR}/${PN}-2.8.1-fix_python.patch" + epatch "${FILESDIR}/${PN}-2.8.1-fix_disconnect_signal.patch" + sed -e "s:%%ADCHPPLIB%%:$libpath:g" \ + "${FILESDIR}/adchpp_runner.sh" > adchpp_runner.sh + sed -e "s:%%ADCHPPLIB%%:$libpath:g" \ + -e "s:%%ADCHPPSHARE%%:$sharepath:g" \ + -e "s:%%ADCHPPETC%%:$etcpath:g" \ + -e "s:%%ADCHPPLOG%%:$logpath:g" \ + -i etc/adchpp.xml -i etc/Script.xml \ + -i rbutil/adchpp.rb -i pyutil/adchpp.py +} + +src_compile() { + escons || die +} + +src_install() { + if use doc; then + newdoc build/docs/readme.html readme.txt + dohtml -r build/docs/user_guide/ + fi + newbin adchpp_runner.sh adchppd + exeinto "$libpath" + doexe "build/$tmode-default-$tarch/bin/"adchppd + doexe "build/$tmode-default-$tarch/bin/"*.so + keepdir "$logpath" + fowners root:adchpp "$logpath" + fperms 0770 "$logpath" + insinto "$etcpath" + doins etc/adchpp.xml + fowners root:adchpp "$etcpath" + fperms 0770 "$etcpath" + #For some reason the core starts login here before booting + dosym "$logpath" "$etcpath/logs" + if use ssl; then + exeinto "$sharepath" + doexe linux/generate_certs.sh + keepdir "$etcpath/certs" + fperms 0700 "$etcpath/certs" + fowners adchpp:adchpp "$etcpath/certs" + keepdir "$etcpath/certs/trusted" + fperms 0700 "$etcpath/certs/trusted" + fowners adchpp:adchpp "$etcpath/certs/trusted" + fi + if use script; then + insinto "$etcpath" + doins etc/Script.xml + insinto "$sharepath/scripts" + doins plugins/Script/examples/* + fperms 0750 "$sharepath/scripts" + fowners root:adchpp "$sharepath/scripts" + keepdir "$etcpath/FL_DataBase" + fowners adchpp:adchpp "$etcpath/FL_DataBase" + fperms 0770 "$etcpath/FL_DataBase" + dosym "$etcpath/FL_DataBase" "$sharepath/scripts/FL_DataBase" + fi + if use ruby; then + insinto "$sharepath" + doins -r rbutil + fi + if use python; then + insinto "$sharepath" + doins -r pyutil + fi + newinitd "${FILESDIR}/${PN}.init.d" "${PN}" + newconfd "${FILESDIR}/${PN}.conf.d" "${PN}" +} diff --git a/net-p2p/adchpp/adchpp-2.8.1.ebuild b/net-p2p/adchpp/adchpp-2.8.1.ebuild deleted file mode 100644 index 9b51fa3..0000000 --- a/net-p2p/adchpp/adchpp-2.8.1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 -SCONS_MIN_VERSION=1.2.0 - -inherit eutils scons-utils toolchain-funcs - -DESCRIPTION="ADC protocol hub made by the people behind DC++" -HOMEPAGE="http://adchpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_source.tar.gz" -S="${WORKDIR}/${PN}_${PV}_source" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~x86" -#TODOS: -#Add info on script and bloom uses -#Python use only on x86 builds -#Select languages -IUSE="+bloom debug doc +lua pch +python +ruby +script +ssl" - -RDEPEND="ssl? ( dev-libs/openssl ) - python? ( || ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) ) - ruby? ( >=dev-lang/ruby-1.9.2 dev-lang/ruby:1.9 ) - sys-libs/readline" -DEPEND="${RDEPEND} - >=dev-lang/swig-1.3.40 - >=sys-devel/gcc-4.4 - ruby? ( >=dev-ruby/rubygems-1.8 ) - doc? ( >=app-text/asciidoc-8.6 )" - -#This sets some useful variables needed for configure and install -pkg_setup() { - if use x86; then - export tarch=x86 - elif use amd64; then - export tarch=x64 - elif use ia64; then - export tarch=ia64 - else - die "Invalid arch" - fi - - if use debug; then - export tmode=debug - else - export tmode=release - fi - #Shortcut for the packages library dir - export libpath="/usr/$(get_libdir)/${P}" - export logpath="/var/log/${PN}" - export etcpath="/etc/${PN}" - export sharepath="/usr/share/${P}" - export varpath="/var/lib/${PN}" - - #Create the users - enewgroup adchpp - enewuser adchpp -1 -1 -1 "adchpp" -} - -src_configure() { - mylangs="" - use lua && mylangs=$mylangs,lua - use python && mylangs=$mylangs,python - use ruby && mylangs=$mylangs,ruby - - myplugins="" - use bloom && myplugins=$myplugins,Bloom - use script && myplugins=$myplugins,Script - - myesconsargs=( -# CC="$(tc-getCC)" - plugins=$myplugins - langs=$mylangs - mode=$tmode - $(use_scons ssl secure) - $(use_scons pch gch) - $(use_scons doc docs) - arch=$tarch -#to use propper ruby - ruby=ruby19 - ) -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.8.0-fix_config_paths.patch" - epatch "${FILESDIR}/${PN}-2.8.1-fix_python.patch" - sed -e "s:%%ADCHPPLIB%%:$libpath:g" \ - "${FILESDIR}/adchpp_runner.sh" > adchpp_runner.sh - sed -e "s:%%ADCHPPLIB%%:$libpath:g" \ - -e "s:%%ADCHPPSHARE%%:$sharepath:g" \ - -e "s:%%ADCHPPETC%%:$etcpath:g" \ - -e "s:%%ADCHPPLOG%%:$logpath:g" \ - -i etc/adchpp.xml -i etc/Script.xml \ - -i rbutil/adchpp.rb -i pyutil/adchpp.py -} - -src_compile() { - escons || die -} - -src_install() { - if use doc; then - newdoc build/docs/readme.html readme.txt - dohtml -r build/docs/user_guide/ - fi - newbin adchpp_runner.sh adchppd - exeinto "$libpath" - doexe "build/$tmode-default-$tarch/bin/"adchppd - doexe "build/$tmode-default-$tarch/bin/"*.so - keepdir "$logpath" - fowners root:adchpp "$logpath" - fperms 0770 "$logpath" - insinto "$etcpath" - doins etc/adchpp.xml - fowners root:adchpp "$etcpath" - fperms 0770 "$etcpath" - #For some reason the core starts login here before booting - dosym "$logpath" "$etcpath/logs" - if use ssl; then - exeinto "$sharepath" - doexe linux/generate_certs.sh - keepdir "$etcpath/certs" - fperms 0700 "$etcpath/certs" - fowners adchpp:adchpp "$etcpath/certs" - keepdir "$etcpath/certs/trusted" - fperms 0700 "$etcpath/certs/trusted" - fowners adchpp:adchpp "$etcpath/certs/trusted" - fi - if use script; then - insinto "$etcpath" - doins etc/Script.xml - insinto "$sharepath/scripts" - doins plugins/Script/examples/* - fperms 0750 "$sharepath/scripts" - fowners root:adchpp "$sharepath/scripts" - keepdir "$etcpath/FL_DataBase" - fowners adchpp:adchpp "$etcpath/FL_DataBase" - fperms 0770 "$etcpath/FL_DataBase" - dosym "$etcpath/FL_DataBase" "$sharepath/scripts/FL_DataBase" - fi - if use ruby; then - insinto "$sharepath" - doins -r rbutil - fi - if use python; then - insinto "$sharepath" - doins -r pyutil - fi - newinitd "${FILESDIR}/${PN}.init.d" "${PN}" - newconfd "${FILESDIR}/${PN}.conf.d" "${PN}" -} diff --git a/net-p2p/adchpp/files/adchpp-2.8.1-fix_disconnect_signal.patch b/net-p2p/adchpp/files/adchpp-2.8.1-fix_disconnect_signal.patch new file mode 100644 index 0000000..261f198 --- /dev/null +++ b/net-p2p/adchpp/files/adchpp-2.8.1-fix_disconnect_signal.patch @@ -0,0 +1,88 @@ +=== modified file 'swig/adchpp.i' +--- swig/adchpp.i 2012-06-29 16:07:26 +0000 ++++ swig/adchpp.i 2012-07-13 19:25:06 +0000 +@@ -284,6 +284,11 @@ + + }; + ++// SWIG doesn't like nested classes ++%{ ++typedef Util::Reason DCReason; ++%} ++ + class CID { + public: + enum { SIZE = 192 / 8 }; +@@ -574,7 +579,7 @@ + size_t getQueuedBytes() throw(); + + /** @param reason The statistic to update */ +- void disconnect(Util::Reason reason, const std::string &) throw(); ++ void disconnect(DCReason reason, const std::string &) throw(); + const std::string& getIp() const throw(); + + /** +@@ -585,7 +590,7 @@ + void setDataMode(const DataFunction& handler, int64_t aBytes); + + %extend{ +- void disconnect(Util::Reason reason) { ++ void disconnect(DCReason reason) { + self->disconnect(reason, Util::emptyString); + } + } +@@ -598,9 +603,9 @@ + using Entity::send; + virtual void send(const BufferPtr& cmd); + +- virtual void disconnect(Util::Reason reason, const std::string &); ++ virtual void disconnect(DCReason reason, const std::string &); + %extend{ +- void disconnect(Util::Reason reason) { ++ void disconnect(DCReason reason) { + self->disconnect(reason, Util::emptyString); + } + } +@@ -628,8 +633,8 @@ + %template(SignalEI) Signal; + %template(SignalTraitsEI) SignalTraits; + +-%template(SignalERS) Signal; +-%template(SignalTraitsERS) SignalTraits; ++%template(SignalERS) Signal; ++%template(SignalTraitsERS) SignalTraits; + + %template(SignalESB) Signal; + %template(SignalTraitsESB) SignalTraits; +@@ -715,7 +720,7 @@ + typedef SignalTraits SignalBadLine; + typedef SignalTraits SignalSend; + typedef SignalTraits SignalState; +- typedef SignalTraits SignalDisconnected; ++ typedef SignalTraits SignalDisconnected; + + SignalConnected::Signal& signalConnected() { return signalConnected_; } + SignalReady::Signal& signalReady() { return signalReady_; } + +=== modified file 'swig/lua.i' +--- swig/lua.i 2011-11-07 22:22:56 +0000 ++++ swig/lua.i 2012-07-13 19:25:06 +0000 +@@ -144,7 +144,7 @@ + lua_pop(L, 1); + } + +- void operator()(adchpp::Entity& c, Util::Reason reason, const std::string& info) { ++ void operator()(adchpp::Entity& c, DCReason reason, const std::string& info) { + pushFunction(); + + SWIG_NewPointerObj(L, &c, SWIGTYPE_p_adchpp__Entity, 0); +@@ -260,7 +260,7 @@ + $1 = LuaFunction(L); + } + +-%typemap(in) std::function { ++%typemap(in) std::function { + $1 = LuaFunction(L); + } + + -- cgit v1.2.3-65-gdbad