From rich at annexia.org Sun Jan 4 19:17:02 2009 From: rich at annexia.org (Richard Jones) Date: Sun, 4 Jan 2009 19:17:02 +0000 Subject: pgocaml and calendar package. In-Reply-To: <4960DCB9.8030804@citycable.ch> References: <4960055D.7060004@citycable.ch> <4960148C.2000405@glondu.net> <20090104120700.GA15665@annexia.org> <4960DCB9.8030804@citycable.ch> Message-ID: <20090104191702.GA29438@annexia.org> OK, I see what's going on here. It's rather complicated ... (1) There can be no actual database around when we build things in Fedora. (2) Because of (1), we don't build the test suite when building PG'OCaml. So no final program ever gets linked. As a result of (2), we don't see the bug you are seeing. But I can reproduce it here easily just by trying to build the test suite. (3) By mistake (possibly a bug) we are shipping the *.cmi files for Calendar -- eg. calendar.cmi. (4) Because of (3), PG'OCaml can compile because it finds modules such as 'Calendar' which don't really exist (because they are packed as 'CalendarLib.Calendar' etc in the final Calendar library). So it works, but we're building a broken PG'OCaml in Fedora, which for various other reasons isn't picked up... This will need a new release of PG'OCaml to fix, but the fix is pretty simple, just adding 'open CalendarLib' to the top of various files. Rich. -- Richard Jones Red Hat From rich at annexia.org Mon Jan 5 00:09:49 2009 From: rich at annexia.org (Richard Jones) Date: Mon, 5 Jan 2009 00:09:49 +0000 Subject: pgocaml and calendar package. In-Reply-To: <20090104191702.GA29438@annexia.org> References: <4960055D.7060004@citycable.ch> <4960148C.2000405@glondu.net> <20090104120700.GA15665@annexia.org> <4960DCB9.8030804@citycable.ch> <20090104191702.GA29438@annexia.org> Message-ID: <20090105000949.GA4266@annexia.org> Bugs filed ... https://bugzilla.redhat.com/show_bug.cgi?id=478782 https://bugzilla.redhat.com/show_bug.cgi?id=478781 Rich. -- Richard Jones Red Hat From steph at glondu.net Mon Jan 5 10:42:01 2009 From: steph at glondu.net (=?ISO-8859-1?Q?St=E9phane_Glondu?=) Date: Mon, 05 Jan 2009 11:42:01 +0100 Subject: pgocaml and calendar package. In-Reply-To: <20090105000949.GA4266@annexia.org> References: <4960055D.7060004@citycable.ch> <4960148C.2000405@glondu.net> <20090104120700.GA15665@annexia.org> <4960DCB9.8030804@citycable.ch> <20090104191702.GA29438@annexia.org> <20090105000949.GA4266@annexia.org> Message-ID: <4961E3F9.7000500@glondu.net> Richard Jones a ?crit : > https://bugzilla.redhat.com/show_bug.cgi?id=478782 The same applies to the Debian package, BTW. And of course, calendarLib.cmi must be installed. Cheers, -- St?phane From ifl2009 at shu.edu Thu Jan 15 17:09:26 2009 From: ifl2009 at shu.edu (IFL 2009) Date: Thu, 15 Jan 2009 12:09:26 -0500 Subject: IFL 2009: Call for Papers Message-ID: Call for Papers IFL 2009 Seton Hall University SOUTH ORANGE, NJ, USA http://tltc.shu.edu/blogs/projects/IFL2009/ The 21st IFL symposium, IFL 2009, will be held for the first time in the USA. The hosting institution is Seton Hall University in South Orange, NJ, USA and the symposium dates are September 23-25, 2009. It is our goal to make IFL a regular event held in the USA. The goal of the IFL symposia is to bring together researchers actively engaged in the implementation and application of functional and function-based programming languages. IFL 2009 will be a venue for researchers to present and discuss new ideas and concepts, work in progress, and publication-ripe results related to the implementation and application of functional languages and function-based programming. Following the IFL tradition, IFL 2009 will use a post-symposium review process to produce a formal proceedings which we expect to be published by Springer in the Lecture Notes in Computer Science series. All participants in IFL 2009 are invited to submit either a draft paper or and extended abstract describing work to be presented at the symposium. These submissions will be screened by the program committee chair to make sure they are within the scope of IFL and will appear in the draft proceedings distributed at the symposium. Submissions appearing in the draft proceedings are not peer-reviewed publications. After the symposium, authors will be given the opportunity to incorporate the feedback from discussions at the symposium and will be invited to submit a revised full arcticle for the formal review process. These revised submissions will be reviewed by the program committee using prevailing academic standards to select the best articles that will appear in the formal proceedings. TOPICS IFL welcomes submissions describing practical and theoretical as well as submissions describing applications and tools. If you are not sure if your work is appropriate for IFL 2009, please contact the PC chair at ifl2009 at shu.edu. Topics of interest include, but are not limited to: language concepts type checking contracts compilation techniques staged compilation runtime function specialization runtime code generation partial evaluation (abstract) interpretation generic programming techniques automatic program generation array processing concurrent/parallel programming concurrent/parallel program execution functional programming and embedded systems functional programming and web applications functional programming and security novel memory management techniques runtime profiling and performance measurements debugging and tracing virtual/abstract machine architectures validation and verification of functional programs tools and programming techniques PAPER SUBMISSIONS Prospective authors are encouraged to submit papers or extended abstracts to be published in the draft proceedings and to present them at the symposium. All contributions must be written in English, conform to the Springer-Verlag LNCS series format and not exceed 16 pages. The draft proceedings will appear as a technical report of the Department of Mathematics and Computer Science of Seton Hall University. IMPORTANT DATES Registration deadline August 15, 2009 Presentation submission deadline August 15, 2009 IFL 2009 Symposium September 23-25, 2009 Submission for review process deadline November 1, 2009 Notification Accept/Reject December 22, 2009 Camera ready version January 15, 2010 PROGRAM COMMITTEE Peter Achten University of Nijmegen, The Netherlands Jost Berthold Philipps-Universit?t Marburg, Germany Andrew Butterfield University of Dublin, Ireland Robby Findler Northwestern University, USA Kathleen Fisher AT&T Research, USA Cormac Flanagan University of California at Santa Cruz, USA Matthew Flatt University of Utah, USA Matthew Fluet Toyota Technological Institute at Chicago, USA Daniel Friedman Indiana University, USA Andy Gill University of Kansas, USA Clemens Grelck University of Amsterdam/Hertfordshire, The Netherlands/UK Jurriaan Hage Utrecht University, The Netherlands Ralf Hinze Oxford University, UK Paul Hudak Yale University, USA John Hughes Chalmers University of Technology, Sweden Patricia Johann University of Strathclyde, UK Yukiyoshi Kameyama University of Tsukuba, Japan Marco T. Moraz?n (Chair) Seton Hall University, USA Rex Page University of Oklahoma, USA Fernando Rubio Universidad Complutense de Madrid, Spain Sven-Bodo Scholz University of Hertfordshire, UK Manuel Serrano INRIA Sophia-Antipolis, France Chung-chieh Shan Rutgers University, USA David Walker Princeton University, USA Vikt?ria Zs?k E?tv?s Lor?nd University, Hungary PETER LANDIN PRIZE The Peter Landin Prize is awarded to the best paper presented at the symposium every year. The honored article is selected by the program committee based on the submissions received for the formal review process. The prize carries a cash award equivalent to 150 euros. -------------- next part -------------- An HTML attachment was scrubbed... URL: From rjones at redhat.com Tue Jan 20 10:46:41 2009 From: rjones at redhat.com (Richard W.M. Jones) Date: Tue, 20 Jan 2009 10:46:41 +0000 Subject: New ocamlmaint account Message-ID: <20090120104641.GA24186@amd.home.annexia.org> I added an ocamlmaint account in FAS & Bugzilla. This account does nothing, but directs CVS commits and new Bugzilla bugs to this mailing list. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v From bugzilla at redhat.com Tue Jan 20 13:36:08 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 20 Jan 2009 08:36:08 -0500 Subject: [Bug 480766] Spanish translation of virt-ctrl (et.redhat.com) In-Reply-To: References: Message-ID: <200901201336.n0KDa8kD009945@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=480766 Dimitris Glezos changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fedora-ocaml-list at redhat.co | |m Component|Transifex |virt-ctrl Version|unspecified |rawhide AssignedTo|dimitris at glezos.com |rjones at redhat.com Product|Fedora Localization |Fedora QAContact|diegobz at gmail.com |extras-qa at fedoraproject.org -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Jan 20 17:21:26 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 20 Jan 2009 12:21:26 -0500 Subject: [Bug 480766] Spanish translation of virt-ctrl (et.redhat.com) In-Reply-To: References: Message-ID: <200901201721.n0KHLQ5u008506@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=480766 daniel cabrera changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |ERRATA --- Comment #1 from daniel cabrera 2009-01-20 12:21:25 EDT --- Sorry folks, wrong place for this bug. Closing it. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From rjones at fedoraproject.org Wed Jan 21 20:57:27 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 21 Jan 2009 20:57:27 +0000 (UTC) Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.6,1.7 Message-ID: <20090121205727.37BB27012F@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cil/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10429 Modified Files: ocaml-cil.spec Log Message: Fix prelink configuration file. Index: ocaml-cil.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ocaml-cil.spec 5 Dec 2008 17:14:25 -0000 1.6 +++ ocaml-cil.spec 21 Jan 2009 20:56:56 -0000 1.7 @@ -6,7 +6,7 @@ Name: ocaml-cil Version: 1.3.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation Group: Development/Libraries @@ -144,7 +144,7 @@ install -m 0755 obj/$archos/cilly.*.exe $DESTDIR%{_libexecdir}/cil/obj/$archos mkdir -p $DESTDIR/etc/prelink.conf.d -echo -- '-b /usr/libexec/cil' > $DESTDIR/etc/prelink.conf.d/ocaml-cil-cilly.conf +echo '-b /usr/libexec/cil' > $DESTDIR/etc/prelink.conf.d/ocaml-cil-cilly.conf %clean rm -rf $RPM_BUILD_ROOT @@ -193,6 +193,9 @@ %changelog +* Wed Jan 21 2009 Richard W.M. Jones - 1.3.6-10 +- Fix prelink configuration file. + * Fri Dec 5 2008 Richard W.M. Jones - 1.3.6-9 - Patch to fix stricter -output-obj checks in OCaml 3.11.0. From rjones at fedoraproject.org Wed Jan 21 20:58:38 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 21 Jan 2009 20:58:38 +0000 (UTC) Subject: rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.9,1.10 Message-ID: <20090121205838.E939A7012F@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10859 Modified Files: ocaml-ocamlnet.spec Log Message: Fix prelink configuration file. Index: ocaml-ocamlnet.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ocaml-ocamlnet.spec 4 Dec 2008 19:30:19 -0000 1.9 +++ ocaml-ocamlnet.spec 21 Jan 2009 20:58:08 -0000 1.10 @@ -6,7 +6,7 @@ Name: ocaml-ocamlnet Version: 2.2.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Network protocols for OCaml Group: Development/Libraries @@ -161,7 +161,7 @@ # NB. Do NOT strip the binaries and prevent prelink from stripping them too. # (https://bugzilla.redhat.com/show_bug.cgi?id=435559) mkdir -p $RPM_BUILD_ROOT/etc/prelink.conf.d -echo -e -- '-b /usr/bin/netplex-admin\n/usr/bin/ocamlrpcgen' \ +echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \ > $RPM_BUILD_ROOT/etc/prelink.conf.d/ocaml-ocamlnet.conf @@ -242,6 +242,9 @@ %changelog +* Wed Jan 21 2009 Richard W.M. Jones - 2.2.9-10 +- Fix prelink configuration file. + * Wed Nov 26 2008 Richard W.M. Jones - 2.2.9-9 - Rebuild for OCaml 3.11.0+rc1. From buildsys at fedoraproject.org Fri Jan 23 07:40:08 2009 From: buildsys at fedoraproject.org (buildsys at fedoraproject.org) Date: Fri, 23 Jan 2009 07:40:08 +0000 (UTC) Subject: Broken dependencies: ocaml-mysql Message-ID: <20090123074008.8BCCF1F829F@releng2.fedora.phx.redhat.com> ocaml-mysql has broken dependencies in the development tree: On ppc: ocaml-mysql-1.0.4-6.fc11.ppc requires libmysqlclient.so.15 On i386: ocaml-mysql-1.0.4-6.fc11.i386 requires libmysqlclient.so.15 Please resolve this as soon as possible. From rjones at fedoraproject.org Fri Jan 23 09:53:55 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 23 Jan 2009 09:53:55 +0000 (UTC) Subject: rpms/ocaml-mysql/devel ocaml-mysql.spec,1.5,1.6 Message-ID: <20090123095355.3984C700FE@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mysql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24610 Modified Files: ocaml-mysql.spec Log Message: Force another rebuild to try to get updated MySQL client deps. Index: ocaml-mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/devel/ocaml-mysql.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ocaml-mysql.spec 17 Jan 2009 14:33:55 -0000 1.5 +++ ocaml-mysql.spec 23 Jan 2009 09:53:24 -0000 1.6 @@ -3,7 +3,7 @@ Name: ocaml-mysql Version: 1.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml library for accessing MySQL databases Group: Development/Libraries @@ -96,6 +96,9 @@ %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 1.0.4-7 +- Force another rebuild to try to get updated MySQL client deps. + * Sat Jan 17 2009 Richard W.M. Jones - 1.0.4-6 - Requires mysql-libs, not automatically found. From bugzilla at redhat.com Fri Jan 23 15:29:09 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Fri, 23 Jan 2009 10:29:09 -0500 Subject: [Bug 481318] New: Missing package for MLGMP Message-ID: Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: Missing package for MLGMP https://bugzilla.redhat.com/show_bug.cgi?id=481318 Summary: Missing package for MLGMP Product: Fedora Version: rawhide Platform: All OS/Version: Linux Status: NEW Severity: medium Priority: low Component: ocaml AssignedTo: rjones at redhat.com ReportedBy: bagnara at cs.unipr.it QAContact: extras-qa at fedoraproject.org CC: gemi at bluewin.ch, rjones at redhat.com, fedora-ocaml-list at redhat.com Classification: Fedora It would be nice to package MLGMP, an extended precision computation library in OCaml (http://caml.inria.fr/cgi-bin/hump.en.cgi?contrib=278) based on GMP. Debian has two packages for MLGMP named libgmp-ocaml and libgmp-ocaml-dev: I tell you in case you want to check the packaging choices they have made (the possible objective being to facilitate the life of application writers that need to produce software working on both Debian and Fedora systems). -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Fri Jan 23 16:24:02 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Fri, 23 Jan 2009 11:24:02 -0500 Subject: [Bug 481318] Missing package for MLGMP In-Reply-To: References: Message-ID: <200901231624.n0NGO23A007886@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=481318 --- Comment #1 from Richard W.M. Jones 2009-01-23 11:24:01 EDT --- Acknowledged ... I don't have much time right now, but if anyone else feels like contributing this package, I can review. Here are some URLs to start people off: http://fedoraproject.org/w/uploads/9/98/PackagingDrafts_OCaml_ocaml-foolib.spec http://fedoraproject.org/wiki/SIGs/OCaml http://fedoraproject.org/wiki/Packaging:OCaml -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Sun Jan 25 23:32:55 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Sun, 25 Jan 2009 18:32:55 -0500 Subject: [Bug 481522] New: Updated Brazilian Portuguese translation of virt-top Message-ID: Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: Updated Brazilian Portuguese translation of virt-top https://bugzilla.redhat.com/show_bug.cgi?id=481522 Summary: Updated Brazilian Portuguese translation of virt-top Product: Fedora Version: rawhide Platform: All OS/Version: Linux Status: NEW Severity: low Priority: low Component: virt-top AssignedTo: rjones at redhat.com ReportedBy: jyulliano at gmail.com QAContact: extras-qa at fedoraproject.org CC: rjones at redhat.com, fedora-virt-maint at redhat.com, fedora-ocaml-list at redhat.com Classification: Fedora Created an attachment (id=329960) --> (https://bugzilla.redhat.com/attachment.cgi?id=329960) Translation file Translation updated by Jyulliano Arruda Ferraro Rocha. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Sun Jan 25 23:41:37 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Sun, 25 Jan 2009 18:41:37 -0500 Subject: [Bug 481522] Updated Brazilian Portuguese translation of virt-top In-Reply-To: References: Message-ID: <200901252341.n0PNfbC4018322@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=481522 --- Comment #1 from Jyulliano Rocha 2009-01-25 18:41:36 EDT --- and revised by Igor Pires Soares. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From peter at fedoraproject.org Mon Jan 26 10:55:34 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Mon, 26 Jan 2009 10:55:34 +0000 (UTC) Subject: rpms/mldonkey/devel import.log, NONE, 1.1 mldonkey-gui.desktop, NONE, 1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate, NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond, NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090126105534.17A8C7010C@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/mldonkey/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28786/devel Modified Files: .cvsignore sources Added Files: import.log mldonkey-gui.desktop mldonkey-initscript.patch mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond mldonkey_df_monitor.sh Log Message: Initial import --- NEW FILE import.log --- mldonkey-2_9_6-3_fc10:HEAD:mldonkey-2.9.6-3.fc10.src.rpm:1232967277 --- NEW FILE mldonkey-gui.desktop --- [Desktop Entry] Name=MlDonkey Type=Application GenericName=MlDonkey peer-to-peer client Exec=mlgui Icon=mldonkey Categories=Network; Encoding=UTF-8 mldonkey-initscript.patch: --- NEW FILE mldonkey-initscript.patch --- diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init index 536a88a..2291a9b 100755 --- a/packages/rpm/mldonkey.init +++ b/packages/rpm/mldonkey.init @@ -4,7 +4,7 @@ # # Laurent Culioli # -# chkconfig: 2345 90 15 +# chkconfig: - 90 15 # description: Mldonkey is client to access multiple peer-to-peer network # processname: mldonkey # config: /etc/sysconfig/mldonkey @@ -15,6 +15,8 @@ # Source some options . /etc/sysconfig/mldonkey +[ -z $LOGFILE ] && LOGFILE="/dev/null" + RETVAL=0 # Path to the mldonkey binarie. @@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet [ ${NETWORKING} = "no" ] && exit 0 start() { - gprintf "Starting Mldonkey (mlnet): " - cd $DIRECTORY - daemon --user mldonkey --check mldonkey $NICE "$fullpath > /dev/null 2>&1 &" - touch /var/lock/subsys/mldonkey - echo + echo -n $"Starting Mldonkey (mlnet): " + cd $DIRECTORY + daemon --user mldonkey --check mldonkey $NICE "$fullpath > $LOGFILE 2>&1 &" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey + echo } stop() { - gprintf "Stopping Mldonkey (mlnet): " - killproc mldonkey-bin - rm -fr /var/lock/subsys/mldonkey - echo + echo -n $"Stopping Mldonkey (mlnet): " + killproc $fullpath + rm -fr /var/lock/subsys/mldonkey + echo } @@ -53,11 +56,19 @@ case "$1" in stop start ;; + condrestart) + if status mldonkey >/dev/null; then + stop + start + else + echo $"Mldonkey (mlnet) is stopped" + fi + ;; status) status mldonkey ;; - *) - gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n" + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" RETVAL=1 esac exit $RETVAL --- NEW FILE mldonkey.logrotate --- /var/log/mldonkey/mldonkey.log { monthly notifempty missingok compress postrotate service mldonkey condrestart > /dev/null endscript } --- NEW FILE mldonkey.spec --- Name: mldonkey Version: 2.9.6 Release: 3%{?dist} Summary: Client for several P2P networks License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: mldonkey-gui.desktop Source8: mldonkey_df_monitor.crond Source9: mldonkey_df_monitor.sh Source11: mldonkey.logrotate Patch0: mldonkey-initscript.patch URL: http://mldonkey.sourceforge.net Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-lablgtk-devel >= 2.10.0 BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: librsvg2-devel >= 2.4.0 BuildRequires: bzip2-devel BuildRequires: ncurses-devel BuildRequires: file-devel Requires: logrotate # for kill_mldonkey Requires: perl(LWP::UserAgent) # for mldonkey_command Requires: nc %description MLDonkey is a door to the 'donkey' network, a decentralized network used to exchange big files on the Internet. It is written in a wonderful language, called Objective-Caml, and present most features of the basic Windows donkey client, plus some more: - It should work on most UNIX-compatible platforms. - You can remotely command your client, either by telnet (port 4000), by a WEB browser (http://localhost:4080), or with a classical client interface (see http://www.nongnu.org/mldonkey) - You can connect to several servers, and each search will query all the connected servers. - You can select mp3s by bitrates in queries (useful ?). - You can select the name of a downloaded file before moving it to your incoming directory. - You can have several queries in the graphical user interface at the same time. - You can remember your old queries results in the command-line interface. - You can search in the history of all files you have seen on the network. It can also access other peer-to-peer networks: - BitTorrent - Fasttrack - FileTP (wget-clone) - DC++ %package gui Summary: Graphical frontend for mldonkey based on GTK Group: Applications/Internet Requires: hicolor-icon-theme # TODO requirement for mldonkey_previewer # Requires: mplayer %description gui The GTK interface for mldonkey provides a convenient way of managing all mldonkey operations. It gives details about conected servers, downloaded files, friends and lets one search for files in a pleasing way. %package server Summary: Enables mldonkey as a system daemon Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} # Neseccary for mldonkey_df_monitor.sh Requires: mailx Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig Requires(preun):/sbin/service %description server Contains init and configs to launch mldonkey as a service. NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched with the mldonkey user (created after installation). NOTE: If you are using a password for your mldonkey, you need to specify it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores it encrypted. %package -n konqueror-mldonkey-ed2k-support Summary: Easy way to download a ed2k-link from Konqueror Group: User Interface/Desktops Requires: perl(LWP::UserAgent) Requires: kde-filesystem %description -n konqueror-mldonkey-ed2k-support This package contains tool which gives you an easy way to add an ed2k-link (like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) with a single click to your mldonkey download queue. You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit #%package -n mozilla-mldonkey-ed2k-support #Summary: Easy way to download a ed2k-link from Mozilla/Firefox #Group: User Interface/Desktops # TODO should it require firefox? #%description -n mozilla-mldonkey-ed2k-support #This package contains tool which gives you an easy way to add an ed2k-link #(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) #with a single click within Mozilla/Firefox to your mldonkey download queue. #The tool is a .xpi file to import into mozilla. The file is located in #%{_datadir}/%name %prep %setup -q %patch0 -p1 -b .fedora # Let's make rpmlint happy sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit sed -i 's|\r||g' docs/slavanap.txt iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt} iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt} chmod 644 src/utils/lib/fst_hash.c chmod 644 src/networks/fasttrack/fst_crypt_ml.c %build %configure --enable-pthread \ --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \ --enable-gui=newgui2 \ --disable-gd make depend # Does not support parallel builds make make utils %install rm -rf $RPM_BUILD_ROOT DONT_GPRINTIFY=1 export DONT_GPRINTIFY make DESTDIR=$RPM_BUILD_ROOT install # core install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey # utils for util in copysources mld_hash get_range make_torrent svg_converter subconv; do install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ; done # gui install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter # install preview utility install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer # menu and pixmaps install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1} # Send email when mldonkey runs out of allowed disk space install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh sed -i 's,/var,%{_localstatedir},g; s,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor # create directory for storing log-file install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey # install logrotate script for /var/log/mldonkey/mldonkey.log install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey # install init-scipt install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey sed -e 's,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g; s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey # Create necessary directories for server install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming # create downloads.ini echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini # Install sysconfig file install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey # ed2k for konqueror support install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol # ed2k for mozilla support # TODO should we unpack it into FF's plugins directory? #install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %clean rm -rf $RPM_BUILD_ROOT %pre server /usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \ -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || : %post server if [ "$1" == "1" ]; then /sbin/chkconfig --add mldonkey || : fi %preun server if [ "$1" == "0" ]; then /sbin/service mldonkey stop >/dev/null 2>&1 || : /sbin/chkconfig --del mldonkey || : fi %files %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %doc docs %{_bindir}/mlnet %{_bindir}/mldonkey_command %{_bindir}/kill_mldonkey %{_bindir}/copysources %{_bindir}/get_range %{_bindir}/make_torrent %{_bindir}/mlbt %{_bindir}/mld_hash %{_bindir}/mldc %{_bindir}/mlgnut %{_bindir}/mldonkey %{_bindir}/mlslsk %{_bindir}/subconv %{_bindir}/svg_converter %files gui %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %{_bindir}/mlbt+gui %{_bindir}/mldc+gui %{_bindir}/mldonkey+gui %{_bindir}/mldonkey_gui %{_bindir}/mldonkey_previewer %{_bindir}/mlgnut+gui %{_bindir}/mlgui %{_bindir}/mlguistarter %{_bindir}/mlnet+gui %{_bindir}/mlslsk+gui %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/mldonkey.png %{_datadir}/icons/hicolor/32x32/apps/mldonkey.png %{_datadir}/icons/hicolor/48x48/apps/mldonkey.png %{_datadir}/pixmaps/mldonkey.png %files server %defattr(-,root,root) %doc Copying.txt %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey %config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor %attr(755,root,root) %{_initrddir}/mldonkey %config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey %{_sbindir}/mldonkey_df_monitor.sh %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey %attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming %config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini #%files -n mozilla-mldonkey-ed2k-support #%defattr(-,root,root) #%doc Copying.txt #%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %files -n konqueror-mldonkey-ed2k-support %defattr(-,root,root) %doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit %{_bindir}/mldonkey_submit %{_datadir}/services/ed2k.protocol %changelog * Mon Jan 26 2009 Peter Lemenkov 2.9.6-3 - Temporarily disable mozilla support * Sat Dec 6 2008 Peter Lemenkov 2.9.6-2 - Fixed installation of sysconfig-file * Mon Aug 25 2008 Peter Lemenkov 2.9.6-1 - Ver. 2.9.6 * Mon Jun 23 2008 Peter Lemenkov 2.9.5-1 - Ver. 2.9.5 * Sun Jan 27 2008 Peter Lemenkov 2.9.3-1 - Ver. 2.9.3 * Sun Jan 13 2008 Peter Lemenkov 2.9.2-2 - Correct BR for perl modules - More robust iconv usage - Fixed desktop file - Changed BR for scriplets * Sun Nov 4 2007 Peter Lemenkov 2.9.2-1 - Ver. 2.9.2 - BR ocaml >= 3.10.0 - BR lablgtk > 2.10.0 * Tue Sep 25 2007 Peter Lemenkov 2.9.1-1 - Ver. 2.9.1 - converted two non-UTF8 text-files * Sun Aug 19 2007 Peter Lemenkov 2.9.0-2 - fixed License tag as required in Fedora * Sun Aug 5 2007 Peter Lemenkov 2.9.0-1 - Added shadow-utils as required - Ver. 2.9.0 - Disabled Gnutella/G2 (unmaintained) - Added BR file-devel (for libmagic) * Wed Jun 6 2007 Peter Lemenkov 2.8.7-1 - Ver. 2.8.7 - Added DC++ back * Sun May 20 2007 Peter Lemenkov 2.8.5-6 - Splitted ed2k-support to mozilla-mldonkey-ed2k-support and konqueror-mldonkey-ed2k-support * Sun May 13 2007 Peter Lemenkov 2.8.5-5 - Fixed bug #1421 * Sat May 5 2007 Peter Lemenkov 2.8.5-4 - Fixed file conflicts - Removed soulseek support (broken) * Sat May 5 2007 Peter Lemenkov 2.8.5-3 - Removed mysterious Requires kdelibs * Fri May 4 2007 Peter Lemenkov 2.8.5-2 - Added BR ncurses-devel * Mon Apr 23 2007 Peter Lemenkov 2.8.5-1 - version 2.8.5 - graphical stats disabled (temporarily?), see bug #1191 - mlchat removed from upstream * Sun May 21 2006 Aurelien Bompard 2.7.6-1 - version 2.7.6 * Mon Apr 17 2006 Aurelien Bompard 2.7.5-1 - version 2.7.5 * Wed Mar 15 2006 Aurelien Bompard 2.7.3-1 - version 2.7.3 - drop patch 0 & patch 1 (applied upstream) * Thu Mar 09 2006 Andreas Bierfert - switch to new release field * Tue Feb 28 2006 Andreas Bierfert - add dist * Fri Dec 02 2005 Aurelien Bompard 2.7.0-0.lvn.2 - patch init script to add condrestart - use condrestart in logrotate * Sun Nov 20 2005 Aurelien Bompard 2.7.0-0.lvn.1 - version 2.7.0 - fix logrotate file * Mon Sep 05 2005 Aurelien Bompard 2.6.4-0.lvn.1 - version 2.6.4 * Mon Aug 22 2005 Aurelien Bompard 2.6.3-0.lvn.1 - version 2.6.3 * Thu Aug 11 2005 Aurelien Bompard 2.6.2-0.lvn.1 - version 2.6.2 * Wed Aug 10 2005 Aurelien Bompard 2.6.1-0.lvn.1 - version 2.6.1 - don't start initscript on boot by default * Fri Jul 22 2005 Aurelien Bompard 2.6.0-0.lvn.1 - update to 2.6.0 - drop explicit Epoch * Mon Jun 27 2005 Aurelien Bompard 0:2.5.30.16-0.lvn.1 - version 2.5.30.16 - add missing scriptlets requirements - don't remove the mldonkey user on uninstall - init script: sync with upstream - sysconfig file: sync with upstream - start script: sync with upstream * Sun Feb 13 2005 Aurelien Bompard 0:2.5.28-0.lvn.1 - version 2.5.28 - enable gui - disable direct-connect (broken at the moment) * Wed Aug 04 2004 Aurelien Bompard 0:2.5.22-0.lvn.1 - version 2.5.22 - get ready for the new gui based on GTK2 (upstream says "still a little buggy", and it does not build yet) * Thu May 06 2004 Aurelien Bompard 0:2.5.21-0.lvn.1 - version 2.5.21 (bugfix again...) * Tue May 04 2004 Aurelien Bompard 0:2.5.20-0.lvn.1 - version 2.5.20 (bugfix) * Mon May 03 2004 Aurelien Bompard 0:2.5.19-0.lvn.1 - version 2.5.19 * Sun Apr 25 2004 Aurelien Bompard 0:2.5.18-0.lvn.1 - version 2.5.18 * Mon Mar 08 2004 Aurelien Bompard 0:2.5.16-0.lvn.1 - update to version 2.5.16 - new subconv tool to convert movie subtitles * Mon Mar 01 2004 Aurelien Bompard 0:2.5.12-0.lvn.1 - Initial Fedora package, ported from Mandrake/PLF --- NEW FILE mldonkey_df_monitor.crond --- */30 * * * * root /usr/sbin/mldonkey_df_monitor.sh --- NEW FILE mldonkey_df_monitor.sh --- #!/bin/sh CACHEDIR="/var/cache/mldonkey" MINFREE=102400 EMAIL="root at localhost" . /etc/sysconfig/mldonkey [ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit send_email() { mail -s "mldonkey, disk space warning" $EMAIL << EOF your $CACHEDIR has only $CURFREE KiB free space left all downloads paused BTW: you can control this check by editing /etc/sysconfig/mldonkey. EOF } CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'` if [ $CURFREE -lt $MINFREE ] ; then /etc/init.d/mldonkey pause > /dev/null send_email fi Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Jan 2009 21:18:40 -0000 1.1 +++ .cvsignore 26 Jan 2009 10:55:03 -0000 1.2 @@ -0,0 +1 @@ +mldonkey-2.9.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Jan 2009 21:18:40 -0000 1.1 +++ sources 26 Jan 2009 10:55:03 -0000 1.2 @@ -0,0 +1 @@ +5da87678449bf87ce0c78f37e7871eb9 mldonkey-2.9.6.tar.bz2 From peter at fedoraproject.org Mon Jan 26 10:57:51 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Mon, 26 Jan 2009 10:57:51 +0000 (UTC) Subject: rpms/mldonkey/F-10 import.log, NONE, 1.1 mldonkey-gui.desktop, NONE, 1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate, NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond, NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090126105751.E1E297010C@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/mldonkey/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29397/F-10 Modified Files: .cvsignore sources Added Files: import.log mldonkey-gui.desktop mldonkey-initscript.patch mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond mldonkey_df_monitor.sh Log Message: Initial import --- NEW FILE import.log --- mldonkey-2_9_6-3_fc10:F-10:mldonkey-2.9.6-3.fc10.src.rpm:1232967409 --- NEW FILE mldonkey-gui.desktop --- [Desktop Entry] Name=MlDonkey Type=Application GenericName=MlDonkey peer-to-peer client Exec=mlgui Icon=mldonkey Categories=Network; Encoding=UTF-8 mldonkey-initscript.patch: --- NEW FILE mldonkey-initscript.patch --- diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init index 536a88a..2291a9b 100755 --- a/packages/rpm/mldonkey.init +++ b/packages/rpm/mldonkey.init @@ -4,7 +4,7 @@ # # Laurent Culioli # -# chkconfig: 2345 90 15 +# chkconfig: - 90 15 # description: Mldonkey is client to access multiple peer-to-peer network # processname: mldonkey # config: /etc/sysconfig/mldonkey @@ -15,6 +15,8 @@ # Source some options . /etc/sysconfig/mldonkey +[ -z $LOGFILE ] && LOGFILE="/dev/null" + RETVAL=0 # Path to the mldonkey binarie. @@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet [ ${NETWORKING} = "no" ] && exit 0 start() { - gprintf "Starting Mldonkey (mlnet): " - cd $DIRECTORY - daemon --user mldonkey --check mldonkey $NICE "$fullpath > /dev/null 2>&1 &" - touch /var/lock/subsys/mldonkey - echo + echo -n $"Starting Mldonkey (mlnet): " + cd $DIRECTORY + daemon --user mldonkey --check mldonkey $NICE "$fullpath > $LOGFILE 2>&1 &" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey + echo } stop() { - gprintf "Stopping Mldonkey (mlnet): " - killproc mldonkey-bin - rm -fr /var/lock/subsys/mldonkey - echo + echo -n $"Stopping Mldonkey (mlnet): " + killproc $fullpath + rm -fr /var/lock/subsys/mldonkey + echo } @@ -53,11 +56,19 @@ case "$1" in stop start ;; + condrestart) + if status mldonkey >/dev/null; then + stop + start + else + echo $"Mldonkey (mlnet) is stopped" + fi + ;; status) status mldonkey ;; - *) - gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n" + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" RETVAL=1 esac exit $RETVAL --- NEW FILE mldonkey.logrotate --- /var/log/mldonkey/mldonkey.log { monthly notifempty missingok compress postrotate service mldonkey condrestart > /dev/null endscript } --- NEW FILE mldonkey.spec --- Name: mldonkey Version: 2.9.6 Release: 3%{?dist} Summary: Client for several P2P networks License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: mldonkey-gui.desktop Source8: mldonkey_df_monitor.crond Source9: mldonkey_df_monitor.sh Source11: mldonkey.logrotate Patch0: mldonkey-initscript.patch URL: http://mldonkey.sourceforge.net Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-lablgtk-devel >= 2.10.0 BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: librsvg2-devel >= 2.4.0 BuildRequires: bzip2-devel BuildRequires: ncurses-devel BuildRequires: file-devel Requires: logrotate # for kill_mldonkey Requires: perl(LWP::UserAgent) # for mldonkey_command Requires: nc %description MLDonkey is a door to the 'donkey' network, a decentralized network used to exchange big files on the Internet. It is written in a wonderful language, called Objective-Caml, and present most features of the basic Windows donkey client, plus some more: - It should work on most UNIX-compatible platforms. - You can remotely command your client, either by telnet (port 4000), by a WEB browser (http://localhost:4080), or with a classical client interface (see http://www.nongnu.org/mldonkey) - You can connect to several servers, and each search will query all the connected servers. - You can select mp3s by bitrates in queries (useful ?). - You can select the name of a downloaded file before moving it to your incoming directory. - You can have several queries in the graphical user interface at the same time. - You can remember your old queries results in the command-line interface. - You can search in the history of all files you have seen on the network. It can also access other peer-to-peer networks: - BitTorrent - Fasttrack - FileTP (wget-clone) - DC++ %package gui Summary: Graphical frontend for mldonkey based on GTK Group: Applications/Internet Requires: hicolor-icon-theme # TODO requirement for mldonkey_previewer # Requires: mplayer %description gui The GTK interface for mldonkey provides a convenient way of managing all mldonkey operations. It gives details about conected servers, downloaded files, friends and lets one search for files in a pleasing way. %package server Summary: Enables mldonkey as a system daemon Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} # Neseccary for mldonkey_df_monitor.sh Requires: mailx Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig Requires(preun):/sbin/service %description server Contains init and configs to launch mldonkey as a service. NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched with the mldonkey user (created after installation). NOTE: If you are using a password for your mldonkey, you need to specify it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores it encrypted. %package -n konqueror-mldonkey-ed2k-support Summary: Easy way to download a ed2k-link from Konqueror Group: User Interface/Desktops Requires: perl(LWP::UserAgent) Requires: kde-filesystem %description -n konqueror-mldonkey-ed2k-support This package contains tool which gives you an easy way to add an ed2k-link (like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) with a single click to your mldonkey download queue. You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit #%package -n mozilla-mldonkey-ed2k-support #Summary: Easy way to download a ed2k-link from Mozilla/Firefox #Group: User Interface/Desktops # TODO should it require firefox? #%description -n mozilla-mldonkey-ed2k-support #This package contains tool which gives you an easy way to add an ed2k-link #(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) #with a single click within Mozilla/Firefox to your mldonkey download queue. #The tool is a .xpi file to import into mozilla. The file is located in #%{_datadir}/%name %prep %setup -q %patch0 -p1 -b .fedora # Let's make rpmlint happy sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit sed -i 's|\r||g' docs/slavanap.txt iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt} iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt} chmod 644 src/utils/lib/fst_hash.c chmod 644 src/networks/fasttrack/fst_crypt_ml.c %build %configure --enable-pthread \ --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \ --enable-gui=newgui2 \ --disable-gd make depend # Does not support parallel builds make make utils %install rm -rf $RPM_BUILD_ROOT DONT_GPRINTIFY=1 export DONT_GPRINTIFY make DESTDIR=$RPM_BUILD_ROOT install # core install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey # utils for util in copysources mld_hash get_range make_torrent svg_converter subconv; do install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ; done # gui install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter # install preview utility install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer # menu and pixmaps install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1} # Send email when mldonkey runs out of allowed disk space install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh sed -i 's,/var,%{_localstatedir},g; s,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor # create directory for storing log-file install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey # install logrotate script for /var/log/mldonkey/mldonkey.log install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey # install init-scipt install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey sed -e 's,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g; s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey # Create necessary directories for server install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming # create downloads.ini echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini # Install sysconfig file install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey # ed2k for konqueror support install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol # ed2k for mozilla support # TODO should we unpack it into FF's plugins directory? #install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %clean rm -rf $RPM_BUILD_ROOT %pre server /usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \ -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || : %post server if [ "$1" == "1" ]; then /sbin/chkconfig --add mldonkey || : fi %preun server if [ "$1" == "0" ]; then /sbin/service mldonkey stop >/dev/null 2>&1 || : /sbin/chkconfig --del mldonkey || : fi %files %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %doc docs %{_bindir}/mlnet %{_bindir}/mldonkey_command %{_bindir}/kill_mldonkey %{_bindir}/copysources %{_bindir}/get_range %{_bindir}/make_torrent %{_bindir}/mlbt %{_bindir}/mld_hash %{_bindir}/mldc %{_bindir}/mlgnut %{_bindir}/mldonkey %{_bindir}/mlslsk %{_bindir}/subconv %{_bindir}/svg_converter %files gui %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %{_bindir}/mlbt+gui %{_bindir}/mldc+gui %{_bindir}/mldonkey+gui %{_bindir}/mldonkey_gui %{_bindir}/mldonkey_previewer %{_bindir}/mlgnut+gui %{_bindir}/mlgui %{_bindir}/mlguistarter %{_bindir}/mlnet+gui %{_bindir}/mlslsk+gui %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/mldonkey.png %{_datadir}/icons/hicolor/32x32/apps/mldonkey.png %{_datadir}/icons/hicolor/48x48/apps/mldonkey.png %{_datadir}/pixmaps/mldonkey.png %files server %defattr(-,root,root) %doc Copying.txt %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey %config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor %attr(755,root,root) %{_initrddir}/mldonkey %config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey %{_sbindir}/mldonkey_df_monitor.sh %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey %attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming %config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini #%files -n mozilla-mldonkey-ed2k-support #%defattr(-,root,root) #%doc Copying.txt #%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %files -n konqueror-mldonkey-ed2k-support %defattr(-,root,root) %doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit %{_bindir}/mldonkey_submit %{_datadir}/services/ed2k.protocol %changelog * Mon Jan 26 2009 Peter Lemenkov 2.9.6-3 - Temporarily disable mozilla support * Sat Dec 6 2008 Peter Lemenkov 2.9.6-2 - Fixed installation of sysconfig-file * Mon Aug 25 2008 Peter Lemenkov 2.9.6-1 - Ver. 2.9.6 * Mon Jun 23 2008 Peter Lemenkov 2.9.5-1 - Ver. 2.9.5 * Sun Jan 27 2008 Peter Lemenkov 2.9.3-1 - Ver. 2.9.3 * Sun Jan 13 2008 Peter Lemenkov 2.9.2-2 - Correct BR for perl modules - More robust iconv usage - Fixed desktop file - Changed BR for scriplets * Sun Nov 4 2007 Peter Lemenkov 2.9.2-1 - Ver. 2.9.2 - BR ocaml >= 3.10.0 - BR lablgtk > 2.10.0 * Tue Sep 25 2007 Peter Lemenkov 2.9.1-1 - Ver. 2.9.1 - converted two non-UTF8 text-files * Sun Aug 19 2007 Peter Lemenkov 2.9.0-2 - fixed License tag as required in Fedora * Sun Aug 5 2007 Peter Lemenkov 2.9.0-1 - Added shadow-utils as required - Ver. 2.9.0 - Disabled Gnutella/G2 (unmaintained) - Added BR file-devel (for libmagic) * Wed Jun 6 2007 Peter Lemenkov 2.8.7-1 - Ver. 2.8.7 - Added DC++ back * Sun May 20 2007 Peter Lemenkov 2.8.5-6 - Splitted ed2k-support to mozilla-mldonkey-ed2k-support and konqueror-mldonkey-ed2k-support * Sun May 13 2007 Peter Lemenkov 2.8.5-5 - Fixed bug #1421 * Sat May 5 2007 Peter Lemenkov 2.8.5-4 - Fixed file conflicts - Removed soulseek support (broken) * Sat May 5 2007 Peter Lemenkov 2.8.5-3 - Removed mysterious Requires kdelibs * Fri May 4 2007 Peter Lemenkov 2.8.5-2 - Added BR ncurses-devel * Mon Apr 23 2007 Peter Lemenkov 2.8.5-1 - version 2.8.5 - graphical stats disabled (temporarily?), see bug #1191 - mlchat removed from upstream * Sun May 21 2006 Aurelien Bompard 2.7.6-1 - version 2.7.6 * Mon Apr 17 2006 Aurelien Bompard 2.7.5-1 - version 2.7.5 * Wed Mar 15 2006 Aurelien Bompard 2.7.3-1 - version 2.7.3 - drop patch 0 & patch 1 (applied upstream) * Thu Mar 09 2006 Andreas Bierfert - switch to new release field * Tue Feb 28 2006 Andreas Bierfert - add dist * Fri Dec 02 2005 Aurelien Bompard 2.7.0-0.lvn.2 - patch init script to add condrestart - use condrestart in logrotate * Sun Nov 20 2005 Aurelien Bompard 2.7.0-0.lvn.1 - version 2.7.0 - fix logrotate file * Mon Sep 05 2005 Aurelien Bompard 2.6.4-0.lvn.1 - version 2.6.4 * Mon Aug 22 2005 Aurelien Bompard 2.6.3-0.lvn.1 - version 2.6.3 * Thu Aug 11 2005 Aurelien Bompard 2.6.2-0.lvn.1 - version 2.6.2 * Wed Aug 10 2005 Aurelien Bompard 2.6.1-0.lvn.1 - version 2.6.1 - don't start initscript on boot by default * Fri Jul 22 2005 Aurelien Bompard 2.6.0-0.lvn.1 - update to 2.6.0 - drop explicit Epoch * Mon Jun 27 2005 Aurelien Bompard 0:2.5.30.16-0.lvn.1 - version 2.5.30.16 - add missing scriptlets requirements - don't remove the mldonkey user on uninstall - init script: sync with upstream - sysconfig file: sync with upstream - start script: sync with upstream * Sun Feb 13 2005 Aurelien Bompard 0:2.5.28-0.lvn.1 - version 2.5.28 - enable gui - disable direct-connect (broken at the moment) * Wed Aug 04 2004 Aurelien Bompard 0:2.5.22-0.lvn.1 - version 2.5.22 - get ready for the new gui based on GTK2 (upstream says "still a little buggy", and it does not build yet) * Thu May 06 2004 Aurelien Bompard 0:2.5.21-0.lvn.1 - version 2.5.21 (bugfix again...) * Tue May 04 2004 Aurelien Bompard 0:2.5.20-0.lvn.1 - version 2.5.20 (bugfix) * Mon May 03 2004 Aurelien Bompard 0:2.5.19-0.lvn.1 - version 2.5.19 * Sun Apr 25 2004 Aurelien Bompard 0:2.5.18-0.lvn.1 - version 2.5.18 * Mon Mar 08 2004 Aurelien Bompard 0:2.5.16-0.lvn.1 - update to version 2.5.16 - new subconv tool to convert movie subtitles * Mon Mar 01 2004 Aurelien Bompard 0:2.5.12-0.lvn.1 - Initial Fedora package, ported from Mandrake/PLF --- NEW FILE mldonkey_df_monitor.crond --- */30 * * * * root /usr/sbin/mldonkey_df_monitor.sh --- NEW FILE mldonkey_df_monitor.sh --- #!/bin/sh CACHEDIR="/var/cache/mldonkey" MINFREE=102400 EMAIL="root at localhost" . /etc/sysconfig/mldonkey [ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit send_email() { mail -s "mldonkey, disk space warning" $EMAIL << EOF your $CACHEDIR has only $CURFREE KiB free space left all downloads paused BTW: you can control this check by editing /etc/sysconfig/mldonkey. EOF } CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'` if [ $CURFREE -lt $MINFREE ] ; then /etc/init.d/mldonkey pause > /dev/null send_email fi Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Jan 2009 21:18:40 -0000 1.1 +++ .cvsignore 26 Jan 2009 10:57:21 -0000 1.2 @@ -0,0 +1 @@ +mldonkey-2.9.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Jan 2009 21:18:40 -0000 1.1 +++ sources 26 Jan 2009 10:57:21 -0000 1.2 @@ -0,0 +1 @@ +5da87678449bf87ce0c78f37e7871eb9 mldonkey-2.9.6.tar.bz2 From peter at fedoraproject.org Mon Jan 26 11:01:06 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Mon, 26 Jan 2009 11:01:06 +0000 (UTC) Subject: rpms/mldonkey/F-9 import.log, NONE, 1.1 mldonkey-gui.desktop, NONE, 1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate, NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond, NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090126110106.D9A507010C@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/mldonkey/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30254/F-9 Modified Files: .cvsignore sources Added Files: import.log mldonkey-gui.desktop mldonkey-initscript.patch mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond mldonkey_df_monitor.sh Log Message: Initial import --- NEW FILE import.log --- mldonkey-2_9_6-3_fc10:F-9:mldonkey-2.9.6-3.fc10.src.rpm:1232967588 --- NEW FILE mldonkey-gui.desktop --- [Desktop Entry] Name=MlDonkey Type=Application GenericName=MlDonkey peer-to-peer client Exec=mlgui Icon=mldonkey Categories=Network; Encoding=UTF-8 mldonkey-initscript.patch: --- NEW FILE mldonkey-initscript.patch --- diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init index 536a88a..2291a9b 100755 --- a/packages/rpm/mldonkey.init +++ b/packages/rpm/mldonkey.init @@ -4,7 +4,7 @@ # # Laurent Culioli # -# chkconfig: 2345 90 15 +# chkconfig: - 90 15 # description: Mldonkey is client to access multiple peer-to-peer network # processname: mldonkey # config: /etc/sysconfig/mldonkey @@ -15,6 +15,8 @@ # Source some options . /etc/sysconfig/mldonkey +[ -z $LOGFILE ] && LOGFILE="/dev/null" + RETVAL=0 # Path to the mldonkey binarie. @@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet [ ${NETWORKING} = "no" ] && exit 0 start() { - gprintf "Starting Mldonkey (mlnet): " - cd $DIRECTORY - daemon --user mldonkey --check mldonkey $NICE "$fullpath > /dev/null 2>&1 &" - touch /var/lock/subsys/mldonkey - echo + echo -n $"Starting Mldonkey (mlnet): " + cd $DIRECTORY + daemon --user mldonkey --check mldonkey $NICE "$fullpath > $LOGFILE 2>&1 &" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey + echo } stop() { - gprintf "Stopping Mldonkey (mlnet): " - killproc mldonkey-bin - rm -fr /var/lock/subsys/mldonkey - echo + echo -n $"Stopping Mldonkey (mlnet): " + killproc $fullpath + rm -fr /var/lock/subsys/mldonkey + echo } @@ -53,11 +56,19 @@ case "$1" in stop start ;; + condrestart) + if status mldonkey >/dev/null; then + stop + start + else + echo $"Mldonkey (mlnet) is stopped" + fi + ;; status) status mldonkey ;; - *) - gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n" + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" RETVAL=1 esac exit $RETVAL --- NEW FILE mldonkey.logrotate --- /var/log/mldonkey/mldonkey.log { monthly notifempty missingok compress postrotate service mldonkey condrestart > /dev/null endscript } --- NEW FILE mldonkey.spec --- Name: mldonkey Version: 2.9.6 Release: 3%{?dist} Summary: Client for several P2P networks License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: mldonkey-gui.desktop Source8: mldonkey_df_monitor.crond Source9: mldonkey_df_monitor.sh Source11: mldonkey.logrotate Patch0: mldonkey-initscript.patch URL: http://mldonkey.sourceforge.net Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-lablgtk-devel >= 2.10.0 BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: librsvg2-devel >= 2.4.0 BuildRequires: bzip2-devel BuildRequires: ncurses-devel BuildRequires: file-devel Requires: logrotate # for kill_mldonkey Requires: perl(LWP::UserAgent) # for mldonkey_command Requires: nc %description MLDonkey is a door to the 'donkey' network, a decentralized network used to exchange big files on the Internet. It is written in a wonderful language, called Objective-Caml, and present most features of the basic Windows donkey client, plus some more: - It should work on most UNIX-compatible platforms. - You can remotely command your client, either by telnet (port 4000), by a WEB browser (http://localhost:4080), or with a classical client interface (see http://www.nongnu.org/mldonkey) - You can connect to several servers, and each search will query all the connected servers. - You can select mp3s by bitrates in queries (useful ?). - You can select the name of a downloaded file before moving it to your incoming directory. - You can have several queries in the graphical user interface at the same time. - You can remember your old queries results in the command-line interface. - You can search in the history of all files you have seen on the network. It can also access other peer-to-peer networks: - BitTorrent - Fasttrack - FileTP (wget-clone) - DC++ %package gui Summary: Graphical frontend for mldonkey based on GTK Group: Applications/Internet Requires: hicolor-icon-theme # TODO requirement for mldonkey_previewer # Requires: mplayer %description gui The GTK interface for mldonkey provides a convenient way of managing all mldonkey operations. It gives details about conected servers, downloaded files, friends and lets one search for files in a pleasing way. %package server Summary: Enables mldonkey as a system daemon Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} # Neseccary for mldonkey_df_monitor.sh Requires: mailx Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig Requires(preun):/sbin/service %description server Contains init and configs to launch mldonkey as a service. NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched with the mldonkey user (created after installation). NOTE: If you are using a password for your mldonkey, you need to specify it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores it encrypted. %package -n konqueror-mldonkey-ed2k-support Summary: Easy way to download a ed2k-link from Konqueror Group: User Interface/Desktops Requires: perl(LWP::UserAgent) Requires: kde-filesystem %description -n konqueror-mldonkey-ed2k-support This package contains tool which gives you an easy way to add an ed2k-link (like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) with a single click to your mldonkey download queue. You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit #%package -n mozilla-mldonkey-ed2k-support #Summary: Easy way to download a ed2k-link from Mozilla/Firefox #Group: User Interface/Desktops # TODO should it require firefox? #%description -n mozilla-mldonkey-ed2k-support #This package contains tool which gives you an easy way to add an ed2k-link #(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) #with a single click within Mozilla/Firefox to your mldonkey download queue. #The tool is a .xpi file to import into mozilla. The file is located in #%{_datadir}/%name %prep %setup -q %patch0 -p1 -b .fedora # Let's make rpmlint happy sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit sed -i 's|\r||g' docs/slavanap.txt iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt} iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt} chmod 644 src/utils/lib/fst_hash.c chmod 644 src/networks/fasttrack/fst_crypt_ml.c %build %configure --enable-pthread \ --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \ --enable-gui=newgui2 \ --disable-gd make depend # Does not support parallel builds make make utils %install rm -rf $RPM_BUILD_ROOT DONT_GPRINTIFY=1 export DONT_GPRINTIFY make DESTDIR=$RPM_BUILD_ROOT install # core install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey # utils for util in copysources mld_hash get_range make_torrent svg_converter subconv; do install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ; done # gui install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter # install preview utility install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer # menu and pixmaps install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1} # Send email when mldonkey runs out of allowed disk space install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh sed -i 's,/var,%{_localstatedir},g; s,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor # create directory for storing log-file install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey # install logrotate script for /var/log/mldonkey/mldonkey.log install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey # install init-scipt install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey sed -e 's,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g; s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey # Create necessary directories for server install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming # create downloads.ini echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini # Install sysconfig file install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey # ed2k for konqueror support install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol # ed2k for mozilla support # TODO should we unpack it into FF's plugins directory? #install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %clean rm -rf $RPM_BUILD_ROOT %pre server /usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \ -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || : %post server if [ "$1" == "1" ]; then /sbin/chkconfig --add mldonkey || : fi %preun server if [ "$1" == "0" ]; then /sbin/service mldonkey stop >/dev/null 2>&1 || : /sbin/chkconfig --del mldonkey || : fi %files %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %doc docs %{_bindir}/mlnet %{_bindir}/mldonkey_command %{_bindir}/kill_mldonkey %{_bindir}/copysources %{_bindir}/get_range %{_bindir}/make_torrent %{_bindir}/mlbt %{_bindir}/mld_hash %{_bindir}/mldc %{_bindir}/mlgnut %{_bindir}/mldonkey %{_bindir}/mlslsk %{_bindir}/subconv %{_bindir}/svg_converter %files gui %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %{_bindir}/mlbt+gui %{_bindir}/mldc+gui %{_bindir}/mldonkey+gui %{_bindir}/mldonkey_gui %{_bindir}/mldonkey_previewer %{_bindir}/mlgnut+gui %{_bindir}/mlgui %{_bindir}/mlguistarter %{_bindir}/mlnet+gui %{_bindir}/mlslsk+gui %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/mldonkey.png %{_datadir}/icons/hicolor/32x32/apps/mldonkey.png %{_datadir}/icons/hicolor/48x48/apps/mldonkey.png %{_datadir}/pixmaps/mldonkey.png %files server %defattr(-,root,root) %doc Copying.txt %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey %config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor %attr(755,root,root) %{_initrddir}/mldonkey %config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey %{_sbindir}/mldonkey_df_monitor.sh %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey %attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming %config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini #%files -n mozilla-mldonkey-ed2k-support #%defattr(-,root,root) #%doc Copying.txt #%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %files -n konqueror-mldonkey-ed2k-support %defattr(-,root,root) %doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit %{_bindir}/mldonkey_submit %{_datadir}/services/ed2k.protocol %changelog * Mon Jan 26 2009 Peter Lemenkov 2.9.6-3 - Temporarily disable mozilla support * Sat Dec 6 2008 Peter Lemenkov 2.9.6-2 - Fixed installation of sysconfig-file * Mon Aug 25 2008 Peter Lemenkov 2.9.6-1 - Ver. 2.9.6 * Mon Jun 23 2008 Peter Lemenkov 2.9.5-1 - Ver. 2.9.5 * Sun Jan 27 2008 Peter Lemenkov 2.9.3-1 - Ver. 2.9.3 * Sun Jan 13 2008 Peter Lemenkov 2.9.2-2 - Correct BR for perl modules - More robust iconv usage - Fixed desktop file - Changed BR for scriplets * Sun Nov 4 2007 Peter Lemenkov 2.9.2-1 - Ver. 2.9.2 - BR ocaml >= 3.10.0 - BR lablgtk > 2.10.0 * Tue Sep 25 2007 Peter Lemenkov 2.9.1-1 - Ver. 2.9.1 - converted two non-UTF8 text-files * Sun Aug 19 2007 Peter Lemenkov 2.9.0-2 - fixed License tag as required in Fedora * Sun Aug 5 2007 Peter Lemenkov 2.9.0-1 - Added shadow-utils as required - Ver. 2.9.0 - Disabled Gnutella/G2 (unmaintained) - Added BR file-devel (for libmagic) * Wed Jun 6 2007 Peter Lemenkov 2.8.7-1 - Ver. 2.8.7 - Added DC++ back * Sun May 20 2007 Peter Lemenkov 2.8.5-6 - Splitted ed2k-support to mozilla-mldonkey-ed2k-support and konqueror-mldonkey-ed2k-support * Sun May 13 2007 Peter Lemenkov 2.8.5-5 - Fixed bug #1421 * Sat May 5 2007 Peter Lemenkov 2.8.5-4 - Fixed file conflicts - Removed soulseek support (broken) * Sat May 5 2007 Peter Lemenkov 2.8.5-3 - Removed mysterious Requires kdelibs * Fri May 4 2007 Peter Lemenkov 2.8.5-2 - Added BR ncurses-devel * Mon Apr 23 2007 Peter Lemenkov 2.8.5-1 - version 2.8.5 - graphical stats disabled (temporarily?), see bug #1191 - mlchat removed from upstream * Sun May 21 2006 Aurelien Bompard 2.7.6-1 - version 2.7.6 * Mon Apr 17 2006 Aurelien Bompard 2.7.5-1 - version 2.7.5 * Wed Mar 15 2006 Aurelien Bompard 2.7.3-1 - version 2.7.3 - drop patch 0 & patch 1 (applied upstream) * Thu Mar 09 2006 Andreas Bierfert - switch to new release field * Tue Feb 28 2006 Andreas Bierfert - add dist * Fri Dec 02 2005 Aurelien Bompard 2.7.0-0.lvn.2 - patch init script to add condrestart - use condrestart in logrotate * Sun Nov 20 2005 Aurelien Bompard 2.7.0-0.lvn.1 - version 2.7.0 - fix logrotate file * Mon Sep 05 2005 Aurelien Bompard 2.6.4-0.lvn.1 - version 2.6.4 * Mon Aug 22 2005 Aurelien Bompard 2.6.3-0.lvn.1 - version 2.6.3 * Thu Aug 11 2005 Aurelien Bompard 2.6.2-0.lvn.1 - version 2.6.2 * Wed Aug 10 2005 Aurelien Bompard 2.6.1-0.lvn.1 - version 2.6.1 - don't start initscript on boot by default * Fri Jul 22 2005 Aurelien Bompard 2.6.0-0.lvn.1 - update to 2.6.0 - drop explicit Epoch * Mon Jun 27 2005 Aurelien Bompard 0:2.5.30.16-0.lvn.1 - version 2.5.30.16 - add missing scriptlets requirements - don't remove the mldonkey user on uninstall - init script: sync with upstream - sysconfig file: sync with upstream - start script: sync with upstream * Sun Feb 13 2005 Aurelien Bompard 0:2.5.28-0.lvn.1 - version 2.5.28 - enable gui - disable direct-connect (broken at the moment) * Wed Aug 04 2004 Aurelien Bompard 0:2.5.22-0.lvn.1 - version 2.5.22 - get ready for the new gui based on GTK2 (upstream says "still a little buggy", and it does not build yet) * Thu May 06 2004 Aurelien Bompard 0:2.5.21-0.lvn.1 - version 2.5.21 (bugfix again...) * Tue May 04 2004 Aurelien Bompard 0:2.5.20-0.lvn.1 - version 2.5.20 (bugfix) * Mon May 03 2004 Aurelien Bompard 0:2.5.19-0.lvn.1 - version 2.5.19 * Sun Apr 25 2004 Aurelien Bompard 0:2.5.18-0.lvn.1 - version 2.5.18 * Mon Mar 08 2004 Aurelien Bompard 0:2.5.16-0.lvn.1 - update to version 2.5.16 - new subconv tool to convert movie subtitles * Mon Mar 01 2004 Aurelien Bompard 0:2.5.12-0.lvn.1 - Initial Fedora package, ported from Mandrake/PLF --- NEW FILE mldonkey_df_monitor.crond --- */30 * * * * root /usr/sbin/mldonkey_df_monitor.sh --- NEW FILE mldonkey_df_monitor.sh --- #!/bin/sh CACHEDIR="/var/cache/mldonkey" MINFREE=102400 EMAIL="root at localhost" . /etc/sysconfig/mldonkey [ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit send_email() { mail -s "mldonkey, disk space warning" $EMAIL << EOF your $CACHEDIR has only $CURFREE KiB free space left all downloads paused BTW: you can control this check by editing /etc/sysconfig/mldonkey. EOF } CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'` if [ $CURFREE -lt $MINFREE ] ; then /etc/init.d/mldonkey pause > /dev/null send_email fi Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Jan 2009 21:18:40 -0000 1.1 +++ .cvsignore 26 Jan 2009 11:00:36 -0000 1.2 @@ -0,0 +1 @@ +mldonkey-2.9.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Jan 2009 21:18:40 -0000 1.1 +++ sources 26 Jan 2009 11:00:36 -0000 1.2 @@ -0,0 +1 @@ +5da87678449bf87ce0c78f37e7871eb9 mldonkey-2.9.6.tar.bz2 From peter at fedoraproject.org Mon Jan 26 11:06:51 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Mon, 26 Jan 2009 11:06:51 +0000 (UTC) Subject: rpms/mldonkey/EL-5 import.log, NONE, 1.1 mldonkey-gui.desktop, NONE, 1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate, NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond, NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090126110651.D0F4F7010C@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/mldonkey/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31641/EL-5 Modified Files: .cvsignore sources Added Files: import.log mldonkey-gui.desktop mldonkey-initscript.patch mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond mldonkey_df_monitor.sh Log Message: Initial import --- NEW FILE import.log --- mldonkey-2_9_6-3_fc10:EL-5:mldonkey-2.9.6-3.fc10.src.rpm:1232967945 --- NEW FILE mldonkey-gui.desktop --- [Desktop Entry] Name=MlDonkey Type=Application GenericName=MlDonkey peer-to-peer client Exec=mlgui Icon=mldonkey Categories=Network; Encoding=UTF-8 mldonkey-initscript.patch: --- NEW FILE mldonkey-initscript.patch --- diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init index 536a88a..2291a9b 100755 --- a/packages/rpm/mldonkey.init +++ b/packages/rpm/mldonkey.init @@ -4,7 +4,7 @@ # # Laurent Culioli # -# chkconfig: 2345 90 15 +# chkconfig: - 90 15 # description: Mldonkey is client to access multiple peer-to-peer network # processname: mldonkey # config: /etc/sysconfig/mldonkey @@ -15,6 +15,8 @@ # Source some options . /etc/sysconfig/mldonkey +[ -z $LOGFILE ] && LOGFILE="/dev/null" + RETVAL=0 # Path to the mldonkey binarie. @@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet [ ${NETWORKING} = "no" ] && exit 0 start() { - gprintf "Starting Mldonkey (mlnet): " - cd $DIRECTORY - daemon --user mldonkey --check mldonkey $NICE "$fullpath > /dev/null 2>&1 &" - touch /var/lock/subsys/mldonkey - echo + echo -n $"Starting Mldonkey (mlnet): " + cd $DIRECTORY + daemon --user mldonkey --check mldonkey $NICE "$fullpath > $LOGFILE 2>&1 &" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey + echo } stop() { - gprintf "Stopping Mldonkey (mlnet): " - killproc mldonkey-bin - rm -fr /var/lock/subsys/mldonkey - echo + echo -n $"Stopping Mldonkey (mlnet): " + killproc $fullpath + rm -fr /var/lock/subsys/mldonkey + echo } @@ -53,11 +56,19 @@ case "$1" in stop start ;; + condrestart) + if status mldonkey >/dev/null; then + stop + start + else + echo $"Mldonkey (mlnet) is stopped" + fi + ;; status) status mldonkey ;; - *) - gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n" + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" RETVAL=1 esac exit $RETVAL --- NEW FILE mldonkey.logrotate --- /var/log/mldonkey/mldonkey.log { monthly notifempty missingok compress postrotate service mldonkey condrestart > /dev/null endscript } --- NEW FILE mldonkey.spec --- Name: mldonkey Version: 2.9.6 Release: 3%{?dist} Summary: Client for several P2P networks License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: mldonkey-gui.desktop Source8: mldonkey_df_monitor.crond Source9: mldonkey_df_monitor.sh Source11: mldonkey.logrotate Patch0: mldonkey-initscript.patch URL: http://mldonkey.sourceforge.net Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-lablgtk-devel >= 2.10.0 BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: librsvg2-devel >= 2.4.0 BuildRequires: bzip2-devel BuildRequires: ncurses-devel BuildRequires: file-devel Requires: logrotate # for kill_mldonkey Requires: perl(LWP::UserAgent) # for mldonkey_command Requires: nc %description MLDonkey is a door to the 'donkey' network, a decentralized network used to exchange big files on the Internet. It is written in a wonderful language, called Objective-Caml, and present most features of the basic Windows donkey client, plus some more: - It should work on most UNIX-compatible platforms. - You can remotely command your client, either by telnet (port 4000), by a WEB browser (http://localhost:4080), or with a classical client interface (see http://www.nongnu.org/mldonkey) - You can connect to several servers, and each search will query all the connected servers. - You can select mp3s by bitrates in queries (useful ?). - You can select the name of a downloaded file before moving it to your incoming directory. - You can have several queries in the graphical user interface at the same time. - You can remember your old queries results in the command-line interface. - You can search in the history of all files you have seen on the network. It can also access other peer-to-peer networks: - BitTorrent - Fasttrack - FileTP (wget-clone) - DC++ %package gui Summary: Graphical frontend for mldonkey based on GTK Group: Applications/Internet Requires: hicolor-icon-theme # TODO requirement for mldonkey_previewer # Requires: mplayer %description gui The GTK interface for mldonkey provides a convenient way of managing all mldonkey operations. It gives details about conected servers, downloaded files, friends and lets one search for files in a pleasing way. %package server Summary: Enables mldonkey as a system daemon Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} # Neseccary for mldonkey_df_monitor.sh Requires: mailx Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig Requires(preun):/sbin/service %description server Contains init and configs to launch mldonkey as a service. NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched with the mldonkey user (created after installation). NOTE: If you are using a password for your mldonkey, you need to specify it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores it encrypted. %package -n konqueror-mldonkey-ed2k-support Summary: Easy way to download a ed2k-link from Konqueror Group: User Interface/Desktops Requires: perl(LWP::UserAgent) Requires: kde-filesystem %description -n konqueror-mldonkey-ed2k-support This package contains tool which gives you an easy way to add an ed2k-link (like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) with a single click to your mldonkey download queue. You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit #%package -n mozilla-mldonkey-ed2k-support #Summary: Easy way to download a ed2k-link from Mozilla/Firefox #Group: User Interface/Desktops # TODO should it require firefox? #%description -n mozilla-mldonkey-ed2k-support #This package contains tool which gives you an easy way to add an ed2k-link #(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) #with a single click within Mozilla/Firefox to your mldonkey download queue. #The tool is a .xpi file to import into mozilla. The file is located in #%{_datadir}/%name %prep %setup -q %patch0 -p1 -b .fedora # Let's make rpmlint happy sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit sed -i 's|\r||g' docs/slavanap.txt iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt} iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt} chmod 644 src/utils/lib/fst_hash.c chmod 644 src/networks/fasttrack/fst_crypt_ml.c %build %configure --enable-pthread \ --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \ --enable-gui=newgui2 \ --disable-gd make depend # Does not support parallel builds make make utils %install rm -rf $RPM_BUILD_ROOT DONT_GPRINTIFY=1 export DONT_GPRINTIFY make DESTDIR=$RPM_BUILD_ROOT install # core install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey # utils for util in copysources mld_hash get_range make_torrent svg_converter subconv; do install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ; done # gui install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter # install preview utility install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer # menu and pixmaps install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1} # Send email when mldonkey runs out of allowed disk space install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh sed -i 's,/var,%{_localstatedir},g; s,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor # create directory for storing log-file install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey # install logrotate script for /var/log/mldonkey/mldonkey.log install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey # install init-scipt install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey sed -e 's,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g; s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey # Create necessary directories for server install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming # create downloads.ini echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini # Install sysconfig file install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey # ed2k for konqueror support install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol # ed2k for mozilla support # TODO should we unpack it into FF's plugins directory? #install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %clean rm -rf $RPM_BUILD_ROOT %pre server /usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \ -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || : %post server if [ "$1" == "1" ]; then /sbin/chkconfig --add mldonkey || : fi %preun server if [ "$1" == "0" ]; then /sbin/service mldonkey stop >/dev/null 2>&1 || : /sbin/chkconfig --del mldonkey || : fi %files %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %doc docs %{_bindir}/mlnet %{_bindir}/mldonkey_command %{_bindir}/kill_mldonkey %{_bindir}/copysources %{_bindir}/get_range %{_bindir}/make_torrent %{_bindir}/mlbt %{_bindir}/mld_hash %{_bindir}/mldc %{_bindir}/mlgnut %{_bindir}/mldonkey %{_bindir}/mlslsk %{_bindir}/subconv %{_bindir}/svg_converter %files gui %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %{_bindir}/mlbt+gui %{_bindir}/mldc+gui %{_bindir}/mldonkey+gui %{_bindir}/mldonkey_gui %{_bindir}/mldonkey_previewer %{_bindir}/mlgnut+gui %{_bindir}/mlgui %{_bindir}/mlguistarter %{_bindir}/mlnet+gui %{_bindir}/mlslsk+gui %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/mldonkey.png %{_datadir}/icons/hicolor/32x32/apps/mldonkey.png %{_datadir}/icons/hicolor/48x48/apps/mldonkey.png %{_datadir}/pixmaps/mldonkey.png %files server %defattr(-,root,root) %doc Copying.txt %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey %config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor %attr(755,root,root) %{_initrddir}/mldonkey %config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey %{_sbindir}/mldonkey_df_monitor.sh %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey %attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming %config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini #%files -n mozilla-mldonkey-ed2k-support #%defattr(-,root,root) #%doc Copying.txt #%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %files -n konqueror-mldonkey-ed2k-support %defattr(-,root,root) %doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit %{_bindir}/mldonkey_submit %{_datadir}/services/ed2k.protocol %changelog * Mon Jan 26 2009 Peter Lemenkov 2.9.6-3 - Temporarily disable mozilla support * Sat Dec 6 2008 Peter Lemenkov 2.9.6-2 - Fixed installation of sysconfig-file * Mon Aug 25 2008 Peter Lemenkov 2.9.6-1 - Ver. 2.9.6 * Mon Jun 23 2008 Peter Lemenkov 2.9.5-1 - Ver. 2.9.5 * Sun Jan 27 2008 Peter Lemenkov 2.9.3-1 - Ver. 2.9.3 * Sun Jan 13 2008 Peter Lemenkov 2.9.2-2 - Correct BR for perl modules - More robust iconv usage - Fixed desktop file - Changed BR for scriplets * Sun Nov 4 2007 Peter Lemenkov 2.9.2-1 - Ver. 2.9.2 - BR ocaml >= 3.10.0 - BR lablgtk > 2.10.0 * Tue Sep 25 2007 Peter Lemenkov 2.9.1-1 - Ver. 2.9.1 - converted two non-UTF8 text-files * Sun Aug 19 2007 Peter Lemenkov 2.9.0-2 - fixed License tag as required in Fedora * Sun Aug 5 2007 Peter Lemenkov 2.9.0-1 - Added shadow-utils as required - Ver. 2.9.0 - Disabled Gnutella/G2 (unmaintained) - Added BR file-devel (for libmagic) * Wed Jun 6 2007 Peter Lemenkov 2.8.7-1 - Ver. 2.8.7 - Added DC++ back * Sun May 20 2007 Peter Lemenkov 2.8.5-6 - Splitted ed2k-support to mozilla-mldonkey-ed2k-support and konqueror-mldonkey-ed2k-support * Sun May 13 2007 Peter Lemenkov 2.8.5-5 - Fixed bug #1421 * Sat May 5 2007 Peter Lemenkov 2.8.5-4 - Fixed file conflicts - Removed soulseek support (broken) * Sat May 5 2007 Peter Lemenkov 2.8.5-3 - Removed mysterious Requires kdelibs * Fri May 4 2007 Peter Lemenkov 2.8.5-2 - Added BR ncurses-devel * Mon Apr 23 2007 Peter Lemenkov 2.8.5-1 - version 2.8.5 - graphical stats disabled (temporarily?), see bug #1191 - mlchat removed from upstream * Sun May 21 2006 Aurelien Bompard 2.7.6-1 - version 2.7.6 * Mon Apr 17 2006 Aurelien Bompard 2.7.5-1 - version 2.7.5 * Wed Mar 15 2006 Aurelien Bompard 2.7.3-1 - version 2.7.3 - drop patch 0 & patch 1 (applied upstream) * Thu Mar 09 2006 Andreas Bierfert - switch to new release field * Tue Feb 28 2006 Andreas Bierfert - add dist * Fri Dec 02 2005 Aurelien Bompard 2.7.0-0.lvn.2 - patch init script to add condrestart - use condrestart in logrotate * Sun Nov 20 2005 Aurelien Bompard 2.7.0-0.lvn.1 - version 2.7.0 - fix logrotate file * Mon Sep 05 2005 Aurelien Bompard 2.6.4-0.lvn.1 - version 2.6.4 * Mon Aug 22 2005 Aurelien Bompard 2.6.3-0.lvn.1 - version 2.6.3 * Thu Aug 11 2005 Aurelien Bompard 2.6.2-0.lvn.1 - version 2.6.2 * Wed Aug 10 2005 Aurelien Bompard 2.6.1-0.lvn.1 - version 2.6.1 - don't start initscript on boot by default * Fri Jul 22 2005 Aurelien Bompard 2.6.0-0.lvn.1 - update to 2.6.0 - drop explicit Epoch * Mon Jun 27 2005 Aurelien Bompard 0:2.5.30.16-0.lvn.1 - version 2.5.30.16 - add missing scriptlets requirements - don't remove the mldonkey user on uninstall - init script: sync with upstream - sysconfig file: sync with upstream - start script: sync with upstream * Sun Feb 13 2005 Aurelien Bompard 0:2.5.28-0.lvn.1 - version 2.5.28 - enable gui - disable direct-connect (broken at the moment) * Wed Aug 04 2004 Aurelien Bompard 0:2.5.22-0.lvn.1 - version 2.5.22 - get ready for the new gui based on GTK2 (upstream says "still a little buggy", and it does not build yet) * Thu May 06 2004 Aurelien Bompard 0:2.5.21-0.lvn.1 - version 2.5.21 (bugfix again...) * Tue May 04 2004 Aurelien Bompard 0:2.5.20-0.lvn.1 - version 2.5.20 (bugfix) * Mon May 03 2004 Aurelien Bompard 0:2.5.19-0.lvn.1 - version 2.5.19 * Sun Apr 25 2004 Aurelien Bompard 0:2.5.18-0.lvn.1 - version 2.5.18 * Mon Mar 08 2004 Aurelien Bompard 0:2.5.16-0.lvn.1 - update to version 2.5.16 - new subconv tool to convert movie subtitles * Mon Mar 01 2004 Aurelien Bompard 0:2.5.12-0.lvn.1 - Initial Fedora package, ported from Mandrake/PLF --- NEW FILE mldonkey_df_monitor.crond --- */30 * * * * root /usr/sbin/mldonkey_df_monitor.sh --- NEW FILE mldonkey_df_monitor.sh --- #!/bin/sh CACHEDIR="/var/cache/mldonkey" MINFREE=102400 EMAIL="root at localhost" . /etc/sysconfig/mldonkey [ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit send_email() { mail -s "mldonkey, disk space warning" $EMAIL << EOF your $CACHEDIR has only $CURFREE KiB free space left all downloads paused BTW: you can control this check by editing /etc/sysconfig/mldonkey. EOF } CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'` if [ $CURFREE -lt $MINFREE ] ; then /etc/init.d/mldonkey pause > /dev/null send_email fi Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Jan 2009 21:18:40 -0000 1.1 +++ .cvsignore 26 Jan 2009 11:06:20 -0000 1.2 @@ -0,0 +1 @@ +mldonkey-2.9.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Jan 2009 21:18:40 -0000 1.1 +++ sources 26 Jan 2009 11:06:20 -0000 1.2 @@ -0,0 +1 @@ +5da87678449bf87ce0c78f37e7871eb9 mldonkey-2.9.6.tar.bz2 From peter at fedoraproject.org Mon Jan 26 11:08:57 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Mon, 26 Jan 2009 11:08:57 +0000 (UTC) Subject: rpms/mldonkey/EL-4 import.log, NONE, 1.1 mldonkey-gui.desktop, NONE, 1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate, NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond, NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090126110857.E2EF77010C@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/mldonkey/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32302/EL-4 Modified Files: .cvsignore sources Added Files: import.log mldonkey-gui.desktop mldonkey-initscript.patch mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond mldonkey_df_monitor.sh Log Message: Initial import --- NEW FILE import.log --- mldonkey-2_9_6-3_fc10:EL-4:mldonkey-2.9.6-3.fc10.src.rpm:1232968075 --- NEW FILE mldonkey-gui.desktop --- [Desktop Entry] Name=MlDonkey Type=Application GenericName=MlDonkey peer-to-peer client Exec=mlgui Icon=mldonkey Categories=Network; Encoding=UTF-8 mldonkey-initscript.patch: --- NEW FILE mldonkey-initscript.patch --- diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init index 536a88a..2291a9b 100755 --- a/packages/rpm/mldonkey.init +++ b/packages/rpm/mldonkey.init @@ -4,7 +4,7 @@ # # Laurent Culioli # -# chkconfig: 2345 90 15 +# chkconfig: - 90 15 # description: Mldonkey is client to access multiple peer-to-peer network # processname: mldonkey # config: /etc/sysconfig/mldonkey @@ -15,6 +15,8 @@ # Source some options . /etc/sysconfig/mldonkey +[ -z $LOGFILE ] && LOGFILE="/dev/null" + RETVAL=0 # Path to the mldonkey binarie. @@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet [ ${NETWORKING} = "no" ] && exit 0 start() { - gprintf "Starting Mldonkey (mlnet): " - cd $DIRECTORY - daemon --user mldonkey --check mldonkey $NICE "$fullpath > /dev/null 2>&1 &" - touch /var/lock/subsys/mldonkey - echo + echo -n $"Starting Mldonkey (mlnet): " + cd $DIRECTORY + daemon --user mldonkey --check mldonkey $NICE "$fullpath > $LOGFILE 2>&1 &" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey + echo } stop() { - gprintf "Stopping Mldonkey (mlnet): " - killproc mldonkey-bin - rm -fr /var/lock/subsys/mldonkey - echo + echo -n $"Stopping Mldonkey (mlnet): " + killproc $fullpath + rm -fr /var/lock/subsys/mldonkey + echo } @@ -53,11 +56,19 @@ case "$1" in stop start ;; + condrestart) + if status mldonkey >/dev/null; then + stop + start + else + echo $"Mldonkey (mlnet) is stopped" + fi + ;; status) status mldonkey ;; - *) - gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n" + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" RETVAL=1 esac exit $RETVAL --- NEW FILE mldonkey.logrotate --- /var/log/mldonkey/mldonkey.log { monthly notifempty missingok compress postrotate service mldonkey condrestart > /dev/null endscript } --- NEW FILE mldonkey.spec --- Name: mldonkey Version: 2.9.6 Release: 3%{?dist} Summary: Client for several P2P networks License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: mldonkey-gui.desktop Source8: mldonkey_df_monitor.crond Source9: mldonkey_df_monitor.sh Source11: mldonkey.logrotate Patch0: mldonkey-initscript.patch URL: http://mldonkey.sourceforge.net Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-lablgtk-devel >= 2.10.0 BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: librsvg2-devel >= 2.4.0 BuildRequires: bzip2-devel BuildRequires: ncurses-devel BuildRequires: file-devel Requires: logrotate # for kill_mldonkey Requires: perl(LWP::UserAgent) # for mldonkey_command Requires: nc %description MLDonkey is a door to the 'donkey' network, a decentralized network used to exchange big files on the Internet. It is written in a wonderful language, called Objective-Caml, and present most features of the basic Windows donkey client, plus some more: - It should work on most UNIX-compatible platforms. - You can remotely command your client, either by telnet (port 4000), by a WEB browser (http://localhost:4080), or with a classical client interface (see http://www.nongnu.org/mldonkey) - You can connect to several servers, and each search will query all the connected servers. - You can select mp3s by bitrates in queries (useful ?). - You can select the name of a downloaded file before moving it to your incoming directory. - You can have several queries in the graphical user interface at the same time. - You can remember your old queries results in the command-line interface. - You can search in the history of all files you have seen on the network. It can also access other peer-to-peer networks: - BitTorrent - Fasttrack - FileTP (wget-clone) - DC++ %package gui Summary: Graphical frontend for mldonkey based on GTK Group: Applications/Internet Requires: hicolor-icon-theme # TODO requirement for mldonkey_previewer # Requires: mplayer %description gui The GTK interface for mldonkey provides a convenient way of managing all mldonkey operations. It gives details about conected servers, downloaded files, friends and lets one search for files in a pleasing way. %package server Summary: Enables mldonkey as a system daemon Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} # Neseccary for mldonkey_df_monitor.sh Requires: mailx Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig Requires(preun):/sbin/service %description server Contains init and configs to launch mldonkey as a service. NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched with the mldonkey user (created after installation). NOTE: If you are using a password for your mldonkey, you need to specify it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores it encrypted. %package -n konqueror-mldonkey-ed2k-support Summary: Easy way to download a ed2k-link from Konqueror Group: User Interface/Desktops Requires: perl(LWP::UserAgent) Requires: kde-filesystem %description -n konqueror-mldonkey-ed2k-support This package contains tool which gives you an easy way to add an ed2k-link (like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) with a single click to your mldonkey download queue. You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit #%package -n mozilla-mldonkey-ed2k-support #Summary: Easy way to download a ed2k-link from Mozilla/Firefox #Group: User Interface/Desktops # TODO should it require firefox? #%description -n mozilla-mldonkey-ed2k-support #This package contains tool which gives you an easy way to add an ed2k-link #(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|) #with a single click within Mozilla/Firefox to your mldonkey download queue. #The tool is a .xpi file to import into mozilla. The file is located in #%{_datadir}/%name %prep %setup -q %patch0 -p1 -b .fedora # Let's make rpmlint happy sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit sed -i 's|\r||g' docs/slavanap.txt iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt} iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt} chmod 644 src/utils/lib/fst_hash.c chmod 644 src/networks/fasttrack/fst_crypt_ml.c %build %configure --enable-pthread \ --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \ --enable-gui=newgui2 \ --disable-gd make depend # Does not support parallel builds make make utils %install rm -rf $RPM_BUILD_ROOT DONT_GPRINTIFY=1 export DONT_GPRINTIFY make DESTDIR=$RPM_BUILD_ROOT install # core install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey # utils for util in copysources mld_hash get_range make_torrent svg_converter subconv; do install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ; done # gui install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter # install preview utility install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer # menu and pixmaps install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1} # Send email when mldonkey runs out of allowed disk space install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh sed -i 's,/var,%{_localstatedir},g; s,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor # create directory for storing log-file install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey # install logrotate script for /var/log/mldonkey/mldonkey.log install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey # install init-scipt install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey sed -e 's,/etc/init.d,%{_initrddir},g; s,/etc,%{_sysconfdir},g; s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey # Create necessary directories for server install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming # create downloads.ini echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini # Install sysconfig file install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey # ed2k for konqueror support install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol # ed2k for mozilla support # TODO should we unpack it into FF's plugins directory? #install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %clean rm -rf $RPM_BUILD_ROOT %pre server /usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \ -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || : %post server if [ "$1" == "1" ]; then /sbin/chkconfig --add mldonkey || : fi %preun server if [ "$1" == "0" ]; then /sbin/service mldonkey stop >/dev/null 2>&1 || : /sbin/chkconfig --del mldonkey || : fi %files %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %doc docs %{_bindir}/mlnet %{_bindir}/mldonkey_command %{_bindir}/kill_mldonkey %{_bindir}/copysources %{_bindir}/get_range %{_bindir}/make_torrent %{_bindir}/mlbt %{_bindir}/mld_hash %{_bindir}/mldc %{_bindir}/mlgnut %{_bindir}/mldonkey %{_bindir}/mlslsk %{_bindir}/subconv %{_bindir}/svg_converter %files gui %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt %{_bindir}/mlbt+gui %{_bindir}/mldc+gui %{_bindir}/mldonkey+gui %{_bindir}/mldonkey_gui %{_bindir}/mldonkey_previewer %{_bindir}/mlgnut+gui %{_bindir}/mlgui %{_bindir}/mlguistarter %{_bindir}/mlnet+gui %{_bindir}/mlslsk+gui %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/mldonkey.png %{_datadir}/icons/hicolor/32x32/apps/mldonkey.png %{_datadir}/icons/hicolor/48x48/apps/mldonkey.png %{_datadir}/pixmaps/mldonkey.png %files server %defattr(-,root,root) %doc Copying.txt %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey %config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor %attr(755,root,root) %{_initrddir}/mldonkey %config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey %{_sbindir}/mldonkey_df_monitor.sh %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey %attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming %config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini #%files -n mozilla-mldonkey-ed2k-support #%defattr(-,root,root) #%doc Copying.txt #%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi %files -n konqueror-mldonkey-ed2k-support %defattr(-,root,root) %doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit %{_bindir}/mldonkey_submit %{_datadir}/services/ed2k.protocol %changelog * Mon Jan 26 2009 Peter Lemenkov 2.9.6-3 - Temporarily disable mozilla support * Sat Dec 6 2008 Peter Lemenkov 2.9.6-2 - Fixed installation of sysconfig-file * Mon Aug 25 2008 Peter Lemenkov 2.9.6-1 - Ver. 2.9.6 * Mon Jun 23 2008 Peter Lemenkov 2.9.5-1 - Ver. 2.9.5 * Sun Jan 27 2008 Peter Lemenkov 2.9.3-1 - Ver. 2.9.3 * Sun Jan 13 2008 Peter Lemenkov 2.9.2-2 - Correct BR for perl modules - More robust iconv usage - Fixed desktop file - Changed BR for scriplets * Sun Nov 4 2007 Peter Lemenkov 2.9.2-1 - Ver. 2.9.2 - BR ocaml >= 3.10.0 - BR lablgtk > 2.10.0 * Tue Sep 25 2007 Peter Lemenkov 2.9.1-1 - Ver. 2.9.1 - converted two non-UTF8 text-files * Sun Aug 19 2007 Peter Lemenkov 2.9.0-2 - fixed License tag as required in Fedora * Sun Aug 5 2007 Peter Lemenkov 2.9.0-1 - Added shadow-utils as required - Ver. 2.9.0 - Disabled Gnutella/G2 (unmaintained) - Added BR file-devel (for libmagic) * Wed Jun 6 2007 Peter Lemenkov 2.8.7-1 - Ver. 2.8.7 - Added DC++ back * Sun May 20 2007 Peter Lemenkov 2.8.5-6 - Splitted ed2k-support to mozilla-mldonkey-ed2k-support and konqueror-mldonkey-ed2k-support * Sun May 13 2007 Peter Lemenkov 2.8.5-5 - Fixed bug #1421 * Sat May 5 2007 Peter Lemenkov 2.8.5-4 - Fixed file conflicts - Removed soulseek support (broken) * Sat May 5 2007 Peter Lemenkov 2.8.5-3 - Removed mysterious Requires kdelibs * Fri May 4 2007 Peter Lemenkov 2.8.5-2 - Added BR ncurses-devel * Mon Apr 23 2007 Peter Lemenkov 2.8.5-1 - version 2.8.5 - graphical stats disabled (temporarily?), see bug #1191 - mlchat removed from upstream * Sun May 21 2006 Aurelien Bompard 2.7.6-1 - version 2.7.6 * Mon Apr 17 2006 Aurelien Bompard 2.7.5-1 - version 2.7.5 * Wed Mar 15 2006 Aurelien Bompard 2.7.3-1 - version 2.7.3 - drop patch 0 & patch 1 (applied upstream) * Thu Mar 09 2006 Andreas Bierfert - switch to new release field * Tue Feb 28 2006 Andreas Bierfert - add dist * Fri Dec 02 2005 Aurelien Bompard 2.7.0-0.lvn.2 - patch init script to add condrestart - use condrestart in logrotate * Sun Nov 20 2005 Aurelien Bompard 2.7.0-0.lvn.1 - version 2.7.0 - fix logrotate file * Mon Sep 05 2005 Aurelien Bompard 2.6.4-0.lvn.1 - version 2.6.4 * Mon Aug 22 2005 Aurelien Bompard 2.6.3-0.lvn.1 - version 2.6.3 * Thu Aug 11 2005 Aurelien Bompard 2.6.2-0.lvn.1 - version 2.6.2 * Wed Aug 10 2005 Aurelien Bompard 2.6.1-0.lvn.1 - version 2.6.1 - don't start initscript on boot by default * Fri Jul 22 2005 Aurelien Bompard 2.6.0-0.lvn.1 - update to 2.6.0 - drop explicit Epoch * Mon Jun 27 2005 Aurelien Bompard 0:2.5.30.16-0.lvn.1 - version 2.5.30.16 - add missing scriptlets requirements - don't remove the mldonkey user on uninstall - init script: sync with upstream - sysconfig file: sync with upstream - start script: sync with upstream * Sun Feb 13 2005 Aurelien Bompard 0:2.5.28-0.lvn.1 - version 2.5.28 - enable gui - disable direct-connect (broken at the moment) * Wed Aug 04 2004 Aurelien Bompard 0:2.5.22-0.lvn.1 - version 2.5.22 - get ready for the new gui based on GTK2 (upstream says "still a little buggy", and it does not build yet) * Thu May 06 2004 Aurelien Bompard 0:2.5.21-0.lvn.1 - version 2.5.21 (bugfix again...) * Tue May 04 2004 Aurelien Bompard 0:2.5.20-0.lvn.1 - version 2.5.20 (bugfix) * Mon May 03 2004 Aurelien Bompard 0:2.5.19-0.lvn.1 - version 2.5.19 * Sun Apr 25 2004 Aurelien Bompard 0:2.5.18-0.lvn.1 - version 2.5.18 * Mon Mar 08 2004 Aurelien Bompard 0:2.5.16-0.lvn.1 - update to version 2.5.16 - new subconv tool to convert movie subtitles * Mon Mar 01 2004 Aurelien Bompard 0:2.5.12-0.lvn.1 - Initial Fedora package, ported from Mandrake/PLF --- NEW FILE mldonkey_df_monitor.crond --- */30 * * * * root /usr/sbin/mldonkey_df_monitor.sh --- NEW FILE mldonkey_df_monitor.sh --- #!/bin/sh CACHEDIR="/var/cache/mldonkey" MINFREE=102400 EMAIL="root at localhost" . /etc/sysconfig/mldonkey [ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit send_email() { mail -s "mldonkey, disk space warning" $EMAIL << EOF your $CACHEDIR has only $CURFREE KiB free space left all downloads paused BTW: you can control this check by editing /etc/sysconfig/mldonkey. EOF } CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'` if [ $CURFREE -lt $MINFREE ] ; then /etc/init.d/mldonkey pause > /dev/null send_email fi Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Jan 2009 21:18:40 -0000 1.1 +++ .cvsignore 26 Jan 2009 11:08:26 -0000 1.2 @@ -0,0 +1 @@ +mldonkey-2.9.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Jan 2009 21:18:40 -0000 1.1 +++ sources 26 Jan 2009 11:08:27 -0000 1.2 @@ -0,0 +1 @@ +5da87678449bf87ce0c78f37e7871eb9 mldonkey-2.9.6.tar.bz2 From bugzilla at redhat.com Thu Jan 29 17:18:52 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Thu, 29 Jan 2009 12:18:52 -0500 Subject: [Bug 483091] New: Updated Brazilian Portuguese translation of virt-ctrl Message-ID: Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: Updated Brazilian Portuguese translation of virt-ctrl https://bugzilla.redhat.com/show_bug.cgi?id=483091 Summary: Updated Brazilian Portuguese translation of virt-ctrl Product: Fedora Version: rawhide Platform: All OS/Version: Linux Status: NEW Severity: medium Priority: low Component: virt-ctrl AssignedTo: rjones at redhat.com ReportedBy: igor at projetofedora.org QAContact: extras-qa at fedoraproject.org CC: rjones at redhat.com, fedora-ocaml-list at redhat.com Classification: Fedora Created an attachment (id=330377) --> (https://bugzilla.redhat.com/attachment.cgi?id=330377) Translation file Translated by Leandro C?sar and revised by Igor Pires Soares -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Thu Jan 29 18:54:39 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Thu, 29 Jan 2009 13:54:39 -0500 Subject: [Bug 483119] New: Updated Brazilian Portuguese translation of virt-df Message-ID: Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: Updated Brazilian Portuguese translation of virt-df https://bugzilla.redhat.com/show_bug.cgi?id=483119 Summary: Updated Brazilian Portuguese translation of virt-df Product: Fedora Version: rawhide Platform: All OS/Version: Linux Status: NEW Severity: medium Priority: low Component: virt-df AssignedTo: rjones at redhat.com ReportedBy: leandro.cesar at gmail.com QAContact: extras-qa at fedoraproject.org CC: rjones at redhat.com, igor at projetofedora.org, fedora-virt-maint at redhat.com, fedora-ocaml-list at redhat.com Classification: Fedora Created an attachment (id=330394) --> (https://bugzilla.redhat.com/attachment.cgi?id=330394) Translation File Translation file Translated by Leandro C?sar -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.