From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH] Add psyc* suite Date: Wed, 28 Sep 2016 15:47:33 +0000 Message-ID: <87mvisowkq.fsf@we.make.ritual.n0.is> References: <20160913113237.17434-1-ng0@we.make.ritual.n0.is> <20160913191644.GC5986@jasmine> <87twdjmw4y.fsf@we.make.ritual.n0.is> <87twdj8qqg.fsf@we.make.ritual.n0.is> <878tulr4qk.fsf@we.make.ritual.n0.is> <8737ktr17c.fsf@we.make.ritual.n0.is> <20160927164933.GA2497@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:32816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpH5M-0002QZ-D8 for guix-devel@gnu.org; Wed, 28 Sep 2016 11:47:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpH5H-0006oX-HR for guix-devel@gnu.org; Wed, 28 Sep 2016 11:47:51 -0400 Received: from aibo.runbox.com ([91.220.196.211]:56056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpH5H-0006nL-1w for guix-devel@gnu.org; Wed, 28 Sep 2016 11:47:47 -0400 In-Reply-To: <20160927164933.GA2497@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi, so next try. The First 3 patches intended for review and possible merge, for patch 4 (psyced) I want some input, this needs hopefully only a simply guix service. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-perl-net-psyc.patch Content-Transfer-Encoding: quoted-printable From=205bfb62bbce996f718bf184a07f163a932975a730 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 28 Sep 2016 13:48:22 +0000 Subject: [PATCH 1/4] gnu: Add perl-net-psyc. * gnu/packages/psyc.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. =2D-- gnu/local.mk | 1 + gnu/packages/psyc.scm | 105 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 106 insertions(+) create mode 100644 gnu/packages/psyc.scm diff --git a/gnu/local.mk b/gnu/local.mk index b864ea9..d49d458 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -296,6 +296,7 @@ GNU_SYSTEM_MODULES =3D \ %D%/packages/pumpio.scm \ %D%/packages/pretty-print.scm \ %D%/packages/protobuf.scm \ + %D%/packages/psyc.scm \ %D%/packages/pv.scm \ %D%/packages/python.scm \ %D%/packages/qemu.scm \ diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm new file mode 100644 index 0000000..4d53dfd =2D-- /dev/null +++ b/gnu/packages/psyc.scm @@ -0,0 +1,105 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2016 ng0 +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages psyc) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix build-system perl) + #:use-module (gnu packages) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) + #:use-module (gnu packages web)) + +(define-public perl-net-psyc + (package + (name "perl-net-psyc") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://perl.psyc.eu/" + "perlpsyc-" version ".zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 + "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42")) + ;; psycmp3 currently depends on MP3::List and rxaudio (shareware), + ;; we can add it back when this is no longer the case. + (snippet '(delete-file "contrib/psycmp3")))) + (build-system perl-build-system) + (inputs + `(("perl-curses" ,perl-curses) + ("perl-io-socket-ssl" ,perl-io-socket-ssl))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ; No configure script + ;; There is a Makefile, but it does not install everything + ;; (leaves out psycion) and says + ;; "# Just to give you a rough idea". XXX: Fix it upstream. + (replace 'build + (lambda _ + (zero? (system* "make" "manuals")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/perl-net-psyc")) + (man1 (string-append out "/share/man/man1")) + (man3 (string-append out "/share/man/man3")) + (bin (string-append out "/bin")) + (libpsyc (string-append out "/lib/psyc/ion")) + (libperl (string-append out "/lib/perl5/site_perl/" + ,(package-version perl)))) + + (copy-recursively "lib/perl5" libperl) + (copy-recursively "lib/psycion" libpsyc) + (copy-recursively "bin" bin) + (install-file "cgi/psycpager" (string-append doc "/cgi")) + (copy-recursively "contrib" (string-append doc "/contrib")) + (copy-recursively "hooks" (string-append doc "/hooks")) + (copy-recursively "sdj" (string-append doc "/sdj")) + (install-file "README.txt" doc) + (install-file "TODO.txt" doc) + (copy-recursively "share/man/man1" man1) + (copy-recursively "share/man/man3" man3) + #t))) + (add-after 'install 'wrap-programs + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure all executables in "bin" find the Perl modules + ;; provided by this package at runtime. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (path (getenv "PERL5LIB"))) + (for-each (lambda (file) + (wrap-program file + `("PERL5LIB" ":" prefix (,path)))) + (find-files bin "\\.*$")) + #t)))))) + (description + "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Sele= ct} and +Gtk2 event loops. This package includes 12 applications and additional sc= ripts: +psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a contr= ol console +for @uref{https://torproject.org,tor} router) and many more.") + (synopsis "Perl implementation of PSYC protocol") + (home-page "http://perlpsyc.pages.de") + (license (list license:gpl2 (package-license perl) + ;; contrib/irssi-psyc.pl: + license:public-domain + ;; bin/psycplay states AGPL with no version: + license:agpl3+)))) =2D-=20 2.10.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-Add-libpsyc.patch Content-Transfer-Encoding: quoted-printable From=203b892ba74e9cbcc933dee1353c817b72f12608e4 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 28 Sep 2016 13:57:14 +0000 Subject: [PATCH 2/4] gnu: Add libpsyc. * gnu/packages/psyc.scm (libpsyc): New variable. =2D-- gnu/packages/psyc.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm index 4d53dfd..253fa64 100644 =2D-- a/gnu/packages/psyc.scm +++ b/gnu/packages/psyc.scm @@ -21,7 +21,10 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix build-system perl) + #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages admin) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages web)) @@ -103,3 +106,41 @@ for @uref{https://torproject.org,tor} router) and many= more.") license:public-domain ;; bin/psycplay states AGPL with no version: license:agpl3+)))) + +(define-public libpsyc + (package + (name "libpsyc") + (version "20160913") + (source (origin + (method url-fetch) + (uri (string-append "http://www.psyced.org/files/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "14q89fxap05ajkfn20rnhc6b1h4i3i2adyr7y6hs5zqwb2lcmc1p")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl) + ("netcat" ,netcat) + ("procps" ,procps))) + (arguments + `(#:make-flags + (list "CC=3Dgcc" + (string-append "PREFIX=3D" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; The rust bindings are the only ones in use, the lpc bindings + ;; are in psyclpc. The other bindings are not used by anything, + ;; the chances are high that the bindings do not even work, + ;; therefore we do not include them. + ;; TODO: Get a cargo build system in Guix. + (delete 'configure)))) ; no configure script + (home-page "http://about.psyc.eu/libpsyc") + (description + "@code{libpsyc} is a PSYC library in C which implements +core aspects of PSYC, useful for all kinds of clients and servers +including psyced.") + (synopsis "PSYC library in C") + (license (list license:agpl3+ + ;; test/test.c is based on a public-domain test + license:public-domain)))) =2D-=20 2.10.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-Add-psyclpc.patch Content-Transfer-Encoding: quoted-printable From=20e9d543c317e31cfc90367f8acd0b9221f28053d4 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 28 Sep 2016 15:20:29 +0000 Subject: [PATCH 3/4] gnu: Add psyclpc. * gnu/packages/psyc.scm (psyclpc): New variable. =2D-- gnu/packages/psyc.scm | 77 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 77 insertions(+) diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm index 253fa64..2a49579 100644 =2D-- a/gnu/packages/psyc.scm +++ b/gnu/packages/psyc.scm @@ -24,9 +24,16 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages compression) + #:use-module (gnu packages gettext) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) #:use-module (gnu packages web)) =20 (define-public perl-net-psyc @@ -144,3 +151,73 @@ including psyced.") (license (list license:agpl3+ ;; test/test.c is based on a public-domain test license:public-domain)))) + +(define-public psyclpc + (package + (name "psyclpc") + (version "20160821") + (source (origin + (method url-fetch) + (uri (string-append "http://www.psyced.org/files/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0c2afcj8b2yr2vmy9sy0528iqs9sw01j6q35lvxicm42gs7vnik2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; There are no tests/checks. + #:configure-flags + ;; If you have questions about this part, look at + ;; "src/settings/psyced" and the ebuild. + (list + "--enable-use-tls=3Dyes" + "--enable-use-mccp" ; Mud Client Compression Protocol, leave this = enabled. + (string-append "--prefix=3D" + (assoc-ref %outputs "out")) + ;; src/Makefile: Set MUD_LIB to the directory which contains + ;; the mud data. defaults to MUD_LIB =3D @libdir@ + (string-append "--libdir=3D" + (assoc-ref %outputs "out") + "/opt/psyced/world") + (string-append "--bindir=3D" + (assoc-ref %outputs "out") + "/opt/psyced/bin") + ;; src/Makefile: Set ERQ_DIR to directory which contains the + ;; stuff which ERQ can execute (hopefully) savely. Was formerly + ;; defined in config.h. defaults to ERQ_DIR=3D @libexecdir@ + (string-append "--libexecdir=3D" + (assoc-ref %outputs "out") + "/opt/psyced/run")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir-to-src + ;; We need to pass this as env variables + ;; and manually change the directory. + (lambda _ + (chdir "src") + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "SHELL" (which "sh"))))) + #:make-flags (list "install-all"))) + (inputs + `(("zlib" ,zlib) + ("openssl" ,openssl))) + ;; pcre is bundled to ensure the version is compatible. XXX: look into + ;; unbundling it. Upstream will update pcre. For functionality + ;; reasons we can not unbundle it right now. + ;; https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=3Dpcre + ;; ("pcre" ,pcre))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("bison" ,bison) + ("gnu-gettext" ,gnu-gettext) + ("help2man" ,help2man) + ("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "http://lpc.psyc.eu/") + (synopsis "psycLPC is a multi-user network server programming language= ") + (description + "LPC is a bytecode language, invented to specifically implement +multi user virtual environments on the internet. This technology is used = for +MUDs and also the psyced implementation of the Protocol for SYnchronous Co= nferencing (PSYC). psycLPC is a fork of LDMud with some new features and +many bug fixes.") + (license license:gpl2))) =2D-=20 2.10.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-Add-psyced.patch Content-Transfer-Encoding: quoted-printable From=20b683f28fc7d91be19534971ab1cba944f882f2d9 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 28 Sep 2016 15:40:50 +0000 Subject: [PATCH 4/4] gnu: Add psyced. * gnu/packages/psyc.scm (psyced): New variable. =2D-- gnu/packages/psyc.scm | 104 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 104 insertions(+) diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm index 2a49579..2d10a26 100644 =2D-- a/gnu/packages/psyc.scm +++ b/gnu/packages/psyc.scm @@ -18,6 +18,7 @@ =20 (define-module (gnu packages psyc) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix build-system perl) @@ -221,3 +222,106 @@ multi user virtual environments on the internet. Thi= s technology is used for MUDs and also the psyced implementation of the Protocol for SYnchronous Co= nferencing (PSYC). psycLPC is a fork of LDMud with some new features and many bug fixes.") (license license:gpl2))) + +;; XXX: We need a service for this which makes it functional, including +;; copying initial data around. +(define-public psyced + (let* ((commit "18e72b74ccc4edef58751475d15138fb1300a3b1") + (revision "1")) + (package + (name "psyced") + (version (string-append "20160830-" revision "." (string-take commit= 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.psyced.org/psyced") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1h2cbb14lvnxyqf9g35h78d796hyhafg3h73jv69z6j2cvhka9r2"))= )) + (build-system gnu-build-system) + (inputs + `(("perl" ,perl))) + ;; psyced needs psyclpc at runtime, specifically you will also not + ;; be able to use psyced witout psyclpc. + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("psyclpc" ,psyclpc))) + (arguments + `(#:tests? #f ; No tests + #:phases + (modify-phases %standard-phases + (delete 'configure) ; No configure + (delete 'build) ; no make build needed + ;; Much of what install.sh used to do is now handled by psyconf= . Upstream + ;; reference is the Gentoo ebuild in the youbroketheinternet-ov= erlay + ;; (https://gnunet.org/git/) where equal ways of installing psy= ced are applied + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) ;symlink it? + (doc (string-append out "/share/doc")) + ;; sandbox in /opt/psyced/world: + (opt (string-append out "/opt/psyced")) + (var (string-append out "/var/psyced")) + (vard (string-append var "/data")) + (vardpe (string-append vard "/person")) + (vardpl (string-append vard "/place")) + (varcon (string-append var "/config")) + (etcpsy (string-append out "/etc/psyc")) ;symlink to= / + (varlp (string-append out "/var/log/psyced")) ;symli= nk to / + (varlpp (string-append varlp "/place"))) ;symlink to= / + (mkdir-p bin) + (mkdir-p doc) + (mkdir-p opt) + (mkdir-p var) + (mkdir-p vard) + (mkdir-p vardpe) + (mkdir-p vardpl) + (mkdir-p varcon) + (mkdir-p etcpsy) + (mkdir-p varlp) + (mkdir-p varlpp) + + (copy-recursively "bin" bin) + + (install-file "config/psyced.ini" etcpsy) + + (install-file "AGENDA.txt" doc) + (install-file "CHANGESTODO" doc) + (install-file "COPYLEFT.txt" doc) + (install-file "LICENSE.txt" doc) + + (copy-recursively "pike" opt) + (copy-recursively "place" opt) + (copy-recursively "run" opt) + (copy-recursively "tor" opt) + (copy-recursively "config" opt) + (copy-recursively "trust" opt) + (copy-recursively "utility" opt) + (copy-recursively "world" opt) + #t))) + (add-after 'install 'wrap-programs + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure all executables in "bin" find the Perl modules + ;; provided by this package at runtime. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (path (string-append out "/lib/perl5/site_perl"))) + (for-each (lambda (file) + (wrap-program file + `("PERL5LIB" ":" prefix (,path)))) + (find-files bin "\\.*$")) + #t)))))) + (home-page "http://www.psyced.org") + (synopsis "Server for Federated Messaging and Chat over PSYC, IRC, X= MPP, and more") + (description + "psyced is a scalable multi-protocol multi-casting chat, messaging +and social server solution to build decentralized chat networks upon. +Powerful, not bloated, not too hard to get into. It supports the +following protocols and formats: PSYC, XMPP S2S, IRC, TELNET, HTTP, SMTP, +OAuth, XML, RSS. It also has limited/experimental code for the following +things: Clients using XMPP C2S, Java Applets, Status.Net, WAP, NNTP.") + (license license:gpl2)))) =2D-=20 2.10.0 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 ng0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJX6+YVAAoJEAKilhUMIBgjkU4P/R4plN/qYpulx26jVVnAivdz NCegT6c51hJ6PHWBY6k1HkDgYEMJZiZcsYZYgSuy8Kh4lwfL2OVqZRYh7J+f4a1l sfq6/hqx2YM5s4/bwhaK6spdFVqMJbK3koMhzkV+YeFrR8sE3dEmIPv3pWdgqScr j2shmiOuDkis1NTFOENJZmNljiQqeekSTxEAEYo5kFVsIjduWO+e63lrrsSzdaSo UxSuwLldZza5TEJVLQ/HUe/bX0kNRtrJ3FT1a5VOAp8bXxTsrvT9HiNE8hRBtBk6 Y5yPN1S8wSLM4gA38vZVOK6UsNxTS7QYeaVRR2WnSZxtZsKi09vh/LSnegsWCYi4 OyEVB2f7AnS2vfJijoq1LWrf8tr3kfTAbMzJhwj7GjtcqJ6rV9mBB5igxr4on/NT cgI/uLFkRdNM6zkNXR+R2i+gDxrQKnVIOyfvi7wtyV6fbkLSiBPbZQqs742QuJMC jPnO0RGUZW8o0xe6ZUVebID3I9MXiWZf4ireT4/zOukRe9lY92HtcSJOOiOmFBH3 yoqC4sgbQesTYgHmMkl/nx9Z3QANnCuL/+EdaP3xcExDlGBBM/KWGVQpMQZJ9RQN JAxlmgInonDzXTeXmkSL1uuskkCj8ToX3ngJaLlHq/6oVH5JoHRluH8HWAYMCWSH bqntgXQyMquAe0/ajh/V =wDbL -----END PGP SIGNATURE----- --==-=-=--